Changeset 8242 for branches/crazyhorse/wp-includes/query.php

Timestamp:

07/02/2008 11:07:56 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

File:

• branches/crazyhorse/wp-includes/query.php (modified) (2 diffs)

branches/crazyhorse/wp-includes/query.php

@@ -929 +929 @@
                 $q['pagename'] = sanitize_title(basename($page_paths));
                 $q['name'] = $q['pagename'];
-                $where .= " AND (ID = '$reqpage')";
+                $where .= " AND ($wpdb->posts.ID = '$reqpage')";
                 $reqpage_obj = get_page($reqpage);
                 if ( 'attachment' == $reqpage_obj->post_type ) {
@@ -1531 +1531 @@
         if ($this->current_post + 1 < $this->post_count) {
             return true;
-        } elseif ($this->current_post + 1 == $this->post_count) {
+        } elseif ($this->current_post + 1 == $this->post_count && $this->post_count > 0) {
             do_action('loop_end');
             // Do some cleaning up after the loop