Changeset 16850 for trunk/wp-includes/taxonomy.php

Timestamp:

12/09/2010 07:36:33 PM (14 years ago)

Author:

scribu

Message:

Correct relation var and PHP4 constructor. See #15752

File:

• trunk/wp-includes/taxonomy.php (modified) (3 diffs)

trunk/wp-includes/taxonomy.php

@@ -536 +536 @@
     var $queries = array();
 
-    function __construct( &$tax_query ) {
+    function WP_Tax_Query( &$tax_query ) {
         if ( isset( $tax_query['relation'] ) && strtoupper( $tax_query['relation'] ) == 'OR' ) {
             $this->relation = 'OR';
@@ -600 +600 @@
 
                 if ( empty( $terms ) ) {
-                    if ( 'OR' == $relation )
+                    if ( 'OR' == $this->relation )
                         continue;
                     else
@@ -634 +634 @@
 
         if ( !empty( $where ) )
-            $where = ' AND ( ' . implode( " $relation ", $where ) . ' )';
+            $where = ' AND ( ' . implode( " $this->relation ", $where ) . ' )';
         else
             $where = '';