Ticket #966: patch2

Index: template-functions-links.php
===================================================================
--- template-functions-links.php        (revision 2428)
+++ template-functions-links.php        (working copy)
@@ -448,17 +448,14 @@
 }
 
 function next_posts_link($label='Next Page »', $max_page=0) {
-       global $paged, $result, $request, $posts_per_page, $wpdb, $max_num_pages;
+    global $paged, $max_num_pages;
     if (!$max_page) {
-                       if ( isset($max_num_pages) ) {
-                               $max_page = $max_num_pages;
-                       } else {
-        preg_match('#FROM (.*) GROUP BY#', $request, $matches);
-        $fromwhere = $matches[1];
-        $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $fromwhere");
-        $max_page = $max_num_pages = ceil($numposts / $posts_per_page);
-                       }
-    }
+      if ( isset($max_num_pages) ) {
+        $max_page = $max_num_pages;
+      } else {
+        count_pages();
+        $max_page = $max_num_pages;
+    }}
     if (!$paged)
         $paged = 1;
     $nextpage = intval($paged) + 1;
@@ -489,27 +486,47 @@
     }
 }
 
+function count_pages() {
+  global $max_num_pages;
+
+  if (! is_single()) {
+    switch (get_query_var('what_to_show')) {
+    case 'posts':
+      aux_count_pages('ID');
+      break;
+
+    case 'days':
+      aux_count_pages('DISTINCT DATE_FORMAT(post_date, \'%d %m %Y\')');
+      break;
+
+    default:
+      $max_num_pages = 999999;
+    }
+  }
+}
+
+function aux_count_pages($what_to_count) {
+  global $request, $posts_per_page, $wpdb, $max_num_pages;
+
+  if ( ! isset($max_num_pages) ) {
+    preg_match('#FROM (.*) GROUP BY#', $request, $matches);
+    $fromwhere = $matches[1];
+    $fromwhere = preg_replace("(/\*TAG\*/.*/\*TAG\*/)","",$fromwhere);
+    $numposts = $wpdb->get_var("SELECT COUNT($what_to_count) FROM $fromwhere");
+    $max_num_pages = ceil($numposts / $posts_per_page);
+  }
+}
+
 function posts_nav_link($sep=' — ', $prelabel='« Previous Page', $nxtlabel='Next Page »') {
-       global $request, $posts_per_page, $wpdb, $max_num_pages;
-       if (! is_single()) {
+       global $max_num_pages;
 
-               if (get_query_var('what_to_show') == 'posts') {
-                       if ( ! isset($max_num_pages) ) {
-                               preg_match('#FROM (.*) GROUP BY#', $request, $matches);
-                               $fromwhere = $matches[1];
-                               $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $fromwhere");
-                               $max_num_pages = ceil($numposts / $posts_per_page);
-                       }
-               } else {
-                       $max_num_pages = 999999;
-               }
+        count_pages();
 
         if ($max_num_pages > 1) {
             previous_posts_link($prelabel);
             echo preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', $sep);
-            next_posts_link($nxtlabel, $max_page);
+            next_posts_link($nxtlabel, $max_num_pages);
         }
-    }
 }
 
 ?>
\ No newline at end of file
Index: classes.php
===================================================================
--- classes.php (revision 2428)
+++ classes.php (working copy)
@@ -525,9 +525,9 @@
                                $end_date = $wpdb->get_var("SELECT min(post_date) FROM $wpdb->posts $join WHERE (1=1) $where GROUP BY year(post_date), month(post_date), dayofmonth(post_date) ORDER BY post_date DESC LIMIT $endrow,1");
 
                                if ($page > 1) {
-                                       $where .= " AND post_date >= '$end_date' AND post_date <= '$start_date'";
+                                       $where .= " /*TAG*/ AND post_date >= '$end_date' AND post_date <= '$start_date' /*TAG*/";
                                } else {
-                                       $where .= " AND post_date >= '$end_date'";
+                                       $where .= " /*TAG*/ AND post_date >= '$end_date' /*TAG*/";
                                }
                        }
                }