Ticket #15202: 15202.2.patch

src/wp-includes/general-template.php

@@ -1148 +1148 @@
         if ( !is_array($cache) )
                 $cache = array();
 
+        $join = apply_filters( 'getcalendar_join', '' );
+        $where = apply_filters( 'getcalendar_where', "AND post_type = 'post' AND post_status = 'publish'" );
+
         // Quick check. If we have no posts at all, abort!
         if ( !$posts ) {
-                $gotsome = $wpdb->get_var("SELECT 1 as test FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1");
+                $gotsome = $wpdb->get_var("SELECT 1 as test FROM $wpdb->posts $join WHERE 1=1 $where LIMIT 1");
                 if ( !$gotsome ) {
                         $cache[ $key ] = '';
                         wp_cache_set( 'get_calendar', $cache, 'calendar' );
@@ -1189 +1192 @@
 
         // 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
-                FROM $wpdb->posts
+                FROM $wpdb->posts $join
                 WHERE post_date < '$thisyear-$thismonth-01'
-                AND post_type = 'post' AND post_status = 'publish'
+                $where
                         ORDER BY post_date DESC
                         LIMIT 1");
         $next = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
-                FROM $wpdb->posts
+                FROM $wpdb->posts $join
                 WHERE post_date > '$thisyear-$thismonth-{$last_day} 23:59:59'
-                AND post_type = 'post' AND post_status = 'publish'
+                $where
                         ORDER BY post_date ASC
                         LIMIT 1");
 
@@ -1250 +1253 @@
 
         // 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'
-                AND post_type = 'post' AND post_status = 'publish'
+                FROM $wpdb->posts $join
+                WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
+                $where
                 AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N);
         if ( $dayswithposts ) {
                 foreach ( (array) $dayswithposts as $daywith ) {
@@ -1268 +1272 @@
 
         $ak_titles_for_day = array();
         $ak_post_titles = $wpdb->get_results("SELECT ID, post_title, DAYOFMONTH(post_date) as dom "
-                ."FROM $wpdb->posts "
+                ."FROM $wpdb->posts $join "
                 ."WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00' "
                 ."AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59' "
-                ."AND post_type = 'post' AND post_status = 'publish'"
+                .$where
         );
         if ( $ak_post_titles ) {
                 foreach ( (array) $ak_post_titles as $ak_post_title ) {