Ticket #4251: 4251.diff

File 4251.diff, 3.5 KB (added by rob1n, 5 years ago)

  • trunk/wp-includes/post.php

     
    229229        if (!empty($exclusions)) 
    230230                $exclusions .= ')'; 
    231231 
    232         $query ="SELECT DISTINCT * FROM $wpdb->posts " ; 
    233         $query .= ( empty( $category ) ? "" : ", $wpdb->post2cat " ); 
    234         $query .= ( empty( $meta_key ) ? "" : ", $wpdb->postmeta " ); 
    235         $query .= " WHERE (post_type = 'post' AND post_status = 'publish') $exclusions $inclusions "; 
    236         $query .= ( empty( $category ) ? "" : "AND ($wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $category. ") " ); 
    237         $query .= ( empty( $meta_key ) | empty($meta_value)  ? "" : " AND ($wpdb->posts.ID = $wpdb->postmeta.post_id AND $wpdb->postmeta.meta_key = '$meta_key' AND $wpdb->postmeta.meta_value = '$meta_value' )" ); 
    238         $query .= " GROUP BY $wpdb->posts.ID ORDER BY " . $orderby . " " . $order . " LIMIT " . $offset . ',' . $numberposts; 
    239  
    240232        $query  = "SELECT DISTINCT * FROM $wpdb->posts "; 
    241233        $query .= empty( $category ) ? '' : ", $wpdb->post2cat ";  
    242234        $query .= empty( $meta_key ) ? '' : ", $wpdb->postmeta "; 

  • branches/2.1/wp-includes/post.php

     
    225225        if (!empty($exclusions)) 
    226226                $exclusions .= ')'; 
    227227 
    228         $query ="SELECT DISTINCT * FROM $wpdb->posts " ; 
    229         $query .= ( empty( $category ) ? "" : ", $wpdb->post2cat " ); 
    230         $query .= ( empty( $meta_key ) ? "" : ", $wpdb->postmeta " ); 
    231         $query .= " WHERE (post_type = 'post' AND post_status = 'publish') $exclusions $inclusions "; 
    232         $query .= ( empty( $category ) ? "" : "AND ($wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $category. ") " ); 
    233         $query .= ( empty( $meta_key ) | empty($meta_value)  ? "" : " AND ($wpdb->posts.ID = $wpdb->postmeta.post_id AND $wpdb->postmeta.meta_key = '$meta_key' AND $wpdb->postmeta.meta_value = '$meta_value' )" ); 
    234         $query .= " GROUP BY $wpdb->posts.ID ORDER BY " . $orderby . " " . $order . " LIMIT " . $offset . ',' . $numberposts; 
    235  
    236228        $query  = "SELECT DISTINCT * FROM $wpdb->posts "; 
    237229        $query .= empty( $category ) ? '' : ", $wpdb->post2cat ";  
    238230        $query .= empty( $meta_key ) ? '' : ", $wpdb->postmeta "; 

  • branches/2.2/wp-includes/post.php

     
    225225        if (!empty($exclusions)) 
    226226                $exclusions .= ')'; 
    227227 
    228         $query ="SELECT DISTINCT * FROM $wpdb->posts " ; 
    229         $query .= ( empty( $category ) ? "" : ", $wpdb->post2cat " ); 
    230         $query .= ( empty( $meta_key ) ? "" : ", $wpdb->postmeta " ); 
    231         $query .= " WHERE (post_type = 'post' AND post_status = 'publish') $exclusions $inclusions "; 
    232         $query .= ( empty( $category ) ? "" : "AND ($wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $category. ") " ); 
    233         $query .= ( empty( $meta_key ) | empty($meta_value)  ? "" : " AND ($wpdb->posts.ID = $wpdb->postmeta.post_id AND $wpdb->postmeta.meta_key = '$meta_key' AND $wpdb->postmeta.meta_value = '$meta_value' )" ); 
    234         $query .= " GROUP BY $wpdb->posts.ID ORDER BY " . $orderby . " " . $order . " LIMIT " . $offset . ',' . $numberposts; 
    235  
    236228        $query  = "SELECT DISTINCT * FROM $wpdb->posts "; 
    237229        $query .= empty( $category ) ? '' : ", $wpdb->post2cat ";  
    238230        $query .= empty( $meta_key ) ? '' : ", $wpdb->postmeta ";