WordPress.org

Make WordPress Core

Changeset 16850


Ignore:
Timestamp:
12/09/2010 07:36:33 PM (9 years ago)
Author:
scribu
Message:

Correct relation var and PHP4 constructor. See #15752

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/taxonomy.php

    r16849 r16850  
    536536    var $queries = array();
    537537
    538     function __construct( &$tax_query ) {
     538    function WP_Tax_Query( &$tax_query ) {
    539539        if ( isset( $tax_query['relation'] ) && strtoupper( $tax_query['relation'] ) == 'OR' ) {
    540540            $this->relation = 'OR';
     
    600600
    601601                if ( empty( $terms ) ) {
    602                     if ( 'OR' == $relation )
     602                    if ( 'OR' == $this->relation )
    603603                        continue;
    604604                    else
     
    634634
    635635        if ( !empty( $where ) )
    636             $where = ' AND ( ' . implode( " $relation ", $where ) . ' )';
     636            $where = ' AND ( ' . implode( " $this->relation ", $where ) . ' )';
    637637        else
    638638            $where = '';
Note: See TracChangeset for help on using the changeset viewer.