Changeset 10646

Timestamp:

02/25/2009 05:09:29 PM (16 years ago)

Author:

ryan

Message:

Revert get_calendar() changes from [10602]. Broke calendar links. see #8351

File:

• trunk/wp-includes/general-template.php (modified) (5 diffs)

trunk/wp-includes/general-template.php

@@ -928 +928 @@
     // 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' LIMIT 1");
+        $gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
         if ( !$gotsome )
             return;
@@ -962 +962 @@
 
     // Get the next and previous month and year with at least one post
-    $previous = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
+    $previous = $wpdb->get_row("SELECT DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
         FROM $wpdb->posts
         WHERE post_date < '$thisyear-$thismonth-01'
@@ -968 +968 @@
             ORDER BY post_date DESC
             LIMIT 1");
-    $last_day = date('t');
-    $next = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
+    $next = $wpdb->get_row("SELECT  DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
         FROM $wpdb->posts
-        WHERE post_date > '$thisyear-$thismonth-{$last_day} 23:59:59'
+        WHERE post_date >   '$thisyear-$thismonth-01'
+        AND MONTH( post_date ) != MONTH( '$thisyear-$thismonth-01' )
         AND post_type = 'post' AND post_status = 'publish'
             ORDER   BY post_date ASC
@@ -1026 +1026 @@
     // Get days with posts
     $dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
-        FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
+        FROM $wpdb->posts WHERE MONTH(post_date) = '$thismonth'
+        AND YEAR(post_date) = '$thisyear'
         AND post_type = 'post' AND post_status = 'publish'
         AND post_date < '" . current_time('mysql') . '\'', ARRAY_N);
@@ -1045 +1046 @@
     $ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom "
         ."FROM $wpdb->posts "
-        ."WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00' "
+        ."WHERE YEAR(post_date) = '$thisyear' "
+        ."AND MONTH(post_date) = '$thismonth' "
         ."AND post_date < '".current_time('mysql')."' "
         ."AND post_type = 'post' AND post_status = 'publish'"