Changeset 1791

Timestamp:

10/13/2004 02:18:17 PM (21 years ago)

Author:

michelvaldrighi

Message:

unb0rked the pagination links

File:

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

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

@@ -505 +505 @@
     global $paged, $result, $request, $posts_per_page, $wpdb;
     if (!$max_page) {
-        preg_match('#WHERE (.*) GROUP BY#', $request, $matches);
-        $where = $matches[1];
-        $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $wpdb->posts WHERE $where");
+        preg_match('#FROM (.*) GROUP BY#', $request, $matches);
+        $fromwhere = $matches[1];
+        $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $fromwhere");
         $max_page = ceil($numposts / $posts_per_page);
     }
@@ -546 +546 @@
 
         if (get_query_var('what_to_show') == 'posts') {
-            preg_match('#WHERE (.*) GROUP BY#', $request, $matches);
-            $where = $matches[1];
-            $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $wpdb->posts WHERE $where");
+            preg_match('#FROM (.*) GROUP BY#', $request, $matches);
+            $fromwhere = $matches[1];
+            $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $fromwhere");
             $max_page = ceil($numposts / $posts_per_page);
         } else {