Changeset 6019

Timestamp:

09/03/2007 04:46:31 PM (18 years ago)

Author:

westi

Message:

Change queries in get_{next|previous}_post so that plugins can INNER JOIN on other tables with an ID column. Fixes #4822 props Cimmo.

File:

• trunk/wp-includes/link-template.php (modified) (4 diffs)

trunk/wp-includes/link-template.php

@@ -366 +366 @@
     $join = '';
     if ( $in_same_cat ) {
-        $join = " INNER JOIN $wpdb->term_relationships AS tr ON $wpdb->posts.ID = tr.object_id ";
+        $join = " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id ";
         $cat_array = wp_get_object_terms($post->ID, 'category', 'fields=tt_ids');
         $join .= ' AND (tr.term_taxonomy_id = ' . intval($cat_array[0]);
@@ -379 +379 @@
         $blah = explode(' and ', $excluded_categories);
         $posts_in_ex_cats = get_objects_in_term($blah, 'category');
-        $posts_in_ex_cats_sql = 'AND ID NOT IN (' . implode($posts_in_ex_cats, ',') . ')';
+        $posts_in_ex_cats_sql = 'AND p.ID NOT IN (' . implode($posts_in_ex_cats, ',') . ')';
     }
 
     $join  = apply_filters( 'get_previous_post_join', $join, $in_same_cat, $excluded_categories );
-    $where = apply_filters( 'get_previous_post_where', "WHERE post_date < '$current_post_date' AND post_type = 'post' AND post_status = 'publish' $posts_in_ex_cats_sql", $in_same_cat, $excluded_categories );
-    $sort  = apply_filters( 'get_previous_post_sort', 'ORDER BY post_date DESC LIMIT 1' );
-
-    return @$wpdb->get_row("SELECT ID, post_title FROM $wpdb->posts $join $where $sort");
+    $where = apply_filters( 'get_previous_post_where', "WHERE p.post_date < '$current_post_date' AND p.post_type = 'post' AND p.post_status = 'publish' $posts_in_ex_cats_sql", $in_same_cat, $excluded_categories );
+    $sort  = apply_filters( 'get_previous_post_sort', 'ORDER BY p.post_date DESC LIMIT 1' );
+
+    return @$wpdb->get_row("SELECT p.ID, p.post_title FROM $wpdb->posts AS p $join $where $sort");
 }
 
@@ -399 +399 @@
     $join = '';
     if ( $in_same_cat ) {
-        $join = " INNER JOIN $wpdb->term_relationships AS tr ON $wpdb->posts.ID = tr.object_id ";
+        $join = " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id ";
         $cat_array = wp_get_object_terms($post->ID, 'category', 'fields=tt_ids');
         $join .= ' AND (tr.term_taxonomy_id = ' . intval($cat_array[0]);
@@ -412 +412 @@
         $blah = explode(' and ', $excluded_categories);
         $posts_in_ex_cats = get_objects_in_term($blah, 'category');
-        $posts_in_ex_cats_sql = 'AND ID NOT IN (' . implode($posts_in_ex_cats, ',') . ')';
+        $posts_in_ex_cats_sql = 'AND p.ID NOT IN (' . implode($posts_in_ex_cats, ',') . ')';
     }
 
     $join  = apply_filters( 'get_next_post_join', $join, $in_same_cat, $excluded_categories );
-    $where = apply_filters( 'get_next_post_where', "WHERE post_date > '$current_post_date' AND post_type = 'post' AND post_status = 'publish' $posts_in_ex_cats_sql AND ID != $post->ID", $in_same_cat, $excluded_categories );
-    $sort  = apply_filters( 'get_next_post_sort', 'ORDER BY post_date ASC LIMIT 1' );
-
-    return @$wpdb->get_row("SELECT ID, post_title FROM $wpdb->posts $join $where $sort");
+    $where = apply_filters( 'get_next_post_where', "WHERE p.post_date > '$current_post_date' AND p.post_type = 'post' AND p.post_status = 'publish' $posts_in_ex_cats_sql AND p.ID != $post->ID", $in_same_cat, $excluded_categories );
+    $sort  = apply_filters( 'get_next_post_sort', 'ORDER BY p.post_date ASC LIMIT 1' );
+
+    return @$wpdb->get_row("SELECT p.ID, p.post_title FROM $wpdb->posts AS p $join $where $sort");
 }