Ticket #8351: patch.diff

wp-includes/general-template.php

@@ -750 +750 @@
         $output = '';
 
         if ( 'monthly' == $type ) {
-                $query = "SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC $limit";
+                $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC $limit";
                 $key = md5($query);
                 $cache = wp_cache_get( 'wp_get_archives' , 'general');
                 if ( !isset( $cache[ $key ] ) ) {
@@ -771 +771 @@
                         }
                 }
         } elseif ('yearly' == $type) {
-                $query = "SELECT DISTINCT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date DESC $limit";
+                $query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date DESC $limit";
                 $key = md5($query);
                 $cache = wp_cache_get( 'wp_get_archives' , 'general');
                 if ( !isset( $cache[ $key ] ) ) {
@@ -792 +792 @@
                         }
                 }
         } elseif ( 'daily' == $type ) {
-                $query = "SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC $limit";
+                $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC $limit";
                 $key = md5($query);
                 $cache = wp_cache_get( 'wp_get_archives' , 'general');
                 if ( !isset( $cache[ $key ] ) ) {
@@ -913 +913 @@
         ob_start();
         // Quick check. If we have no posts at all, abort!
         if ( !$posts ) {
-                $gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
+                $gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1");
                 if ( !$gotsome )
                         return;
         }
@@ -947 +947 @@
         $unixmonth = mktime(0, 0 , 0, $thismonth, 1, $thisyear);
 
         // Get the next and previous month and year with at least one post
-        $previous = $wpdb->get_row("SELECT DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
+        $previous = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
                 FROM $wpdb->posts
                 WHERE post_date < '$thisyear-$thismonth-01'
                 AND post_type = 'post' AND post_status = 'publish'
                         ORDER BY post_date DESC
                         LIMIT 1");
-        $next = $wpdb->get_row("SELECT  DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
+        $last_day = date('t');
+        $next = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
                 FROM $wpdb->posts
-                WHERE post_date >       '$thisyear-$thismonth-01'
-                AND MONTH( post_date ) != MONTH( '$thisyear-$thismonth-01' )
+                WHERE post_date > '$thisyear-$thismonth-{$last_day} 23:59:59'
                 AND post_type = 'post' AND post_status = 'publish'
                         ORDER   BY post_date ASC
                         LIMIT 1");
@@ -1011 +1011 @@
 
         // Get days with posts
         $dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
-                FROM $wpdb->posts WHERE MONTH(post_date) = '$thismonth'
-                AND YEAR(post_date) = '$thisyear'
+                FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
                 AND post_type = 'post' AND post_status = 'publish'
                 AND post_date < '" . current_time('mysql') . '\'', ARRAY_N);
         if ( $dayswithposts ) {
@@ -1031 +1030 @@
         $ak_titles_for_day = array();
         $ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom "
                 ."FROM $wpdb->posts "
-                ."WHERE YEAR(post_date) = '$thisyear' "
-                ."AND MONTH(post_date) = '$thismonth' "
+                ."WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00' "
                 ."AND post_date < '".current_time('mysql')."' "
                 ."AND post_type = 'post' AND post_status = 'publish'"
         );