Changeset 2855

Timestamp:

09/08/2005 09:05:07 PM (19 years ago)

Author:

ryan

Message:

posts_nav_link fixes from Denis-de-Bernardy. fixes #789

File:

• trunk/wp-includes/template-functions-links.php (modified) (2 diffs)

trunk/wp-includes/template-functions-links.php

@@ -438 +438 @@
                 $max_page = $max_num_pages;
             } else {
-        preg_match('#FROM (.*) GROUP BY#', $request, $matches);
+        preg_match('#FROM\s(.*)\sGROUP BY#siU', $request, $matches);
         $fromwhere = $matches[1];
-        $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $fromwhere");
+        $numposts = $wpdb->get_var("SELECT COUNT(DISTINCT ID) FROM $fromwhere");
         $max_page = $max_num_pages = ceil($numposts / $posts_per_page);
             }
@@ -480 +480 @@
         if (get_query_var('what_to_show') == 'posts') {
             if ( ! isset($max_num_pages) ) {
-                preg_match('#FROM (.*) GROUP BY#', $request, $matches);
+                preg_match('#FROM\s(.*)\sGROUP BY#siU', $request, $matches);
                 $fromwhere = $matches[1];
-                $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $fromwhere");
+                $numposts = $wpdb->get_var("SELECT COUNT(DISTINCT ID) FROM $fromwhere");
                 $max_num_pages = ceil($numposts / $posts_per_page);
             }