Ticket #34093: 34093-4.diff

src/wp-includes/general-template.php

@@ -1863 +1863 @@
  * no posts for the month, then it will not be displayed.
  *
  * @since 1.0.0
+ * @since 4.7 new filter
  *
  * @global wpdb      $wpdb
  * @global int       $m
@@ -1871 +1872 @@
  * @global WP_Locale $wp_locale
  * @global array     $posts
  *
- * @param bool $initial Optional, default is true. Use initial calendar names.
- * @param bool $echo    Optional, default is true. Set to false for return.
- * @return string|void String when retrieving.
+ * @param array $args{
+ *    @type bool $initial defaults to true
+ *    @type bool $echo defaults to true
+ *    @type string $post_type defaults to post
+ * }
+ *
+*@return string|void String when retrieving.
  */
-function get_calendar( $initial = true, $echo = true ) {
+function get_calendar( $args = array() ) {
         global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
 
+        $defaults = array(
+                'initial'   => true,
+                'echo'      => true,
+                'post_type' => 'post',
+        );
+
+        if ( ! is_array( $args ) ) {
+                $backwards_compatible_args = func_get_args();
+
+                if ( isset( $backwards_compatible_args[0] ) && is_bool( $backwards_compatible_args[0] ) ){
+                        $defaults['initial'] = $backwards_compatible_args[0];
+                }
+
+                if ( isset( $backwards_compatible_args[1] ) && is_bool( $backwards_compatible_args[1] ) ){
+                        $defaults['echo'] = $backwards_compatible_args[1];
+                }
+        }
+
+        $args = wp_parse_args( $args, $defaults);
+
         $key = md5( $m . $monthnum . $year );
         $cache = wp_cache_get( 'get_calendar', 'calendar' );
 
@@ -1885 +1910 @@
                 /** This filter is documented in wp-includes/general-template.php */
                 $output = apply_filters( 'get_calendar', $cache[ $key ] );
 
-                if ( $echo ) {
+                if ( $args['echo'] ) {
                         echo $output;
                         return;
                 }
@@ -1897 +1922 @@
                 $cache = array();
         }
 
+        /**
+         * Filter the `get_calander` function arguments before they are used..
+         *
+         * @since 4.7
+         * @param array $args
+         */
+        $post_type = apply_filters( 'get_calendar_args', $args );
+
+        if ( ! post_type_exists( $post_type ) ) {
+                // set the post type back to 'post' if the filter value is not a valid post type
+                $post_type = 'post';
+        }
+
         // 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");
+                $prepared_query = $wpdb->prepare( "SELECT 1 as test FROM $wpdb->posts WHERE post_type = %s AND post_status = 'publish' LIMIT 1", $post_type );
+                $gotsome = $wpdb->get_var( $prepared_query );
                 if ( ! $gotsome ) {
                         $cache[ $key ] = '';
                         wp_cache_set( 'get_calendar', $cache, 'calendar' );
@@ -1940 +1979 @@
         $last_day = date( 't', $unixmonth );
 
         // 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_prepared_query = $wpdb->prepare( "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'
+                AND post_type = %s AND post_status = 'publish'
                         ORDER BY post_date DESC
-                        LIMIT 1");
-        $next = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
+                        LIMIT 1" , $post_type);
+        $previous = $wpdb->get_row( $previous_prepared_query );
+
+        $next_prepared_query = $wpdb->prepare( "SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
                 FROM $wpdb->posts
                 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");
+                AND post_type = %s AND post_status = 'publish'
+                ORDER BY post_date ASC
+                LIMIT 1", $post_type );
+        $next = $wpdb->get_row( $next_prepared_query );
 
         /* translators: Calendar caption: 1: month name, 2: 4-digit year */
         $calendar_caption = _x('%1$s %2$s', 'calendar caption');
@@ -1971 +2013 @@
         }
 
         foreach ( $myweek as $wd ) {
-                $day_name = $initial ? $wp_locale->get_weekday_initial( $wd ) : $wp_locale->get_weekday_abbrev( $wd );
+                $day_name = $args['initial'] ? $wp_locale->get_weekday_initial( $wd ) : $wp_locale->get_weekday_abbrev( $wd );
                 $wd = esc_attr( $wd );
                 $calendar_output .= "\n\t\t<th scope=\"col\" title=\"$wd\">$day_name</th>";
         }
@@ -2011 +2053 @@
         $daywithpost = array();
 
         // Get days with posts
-        $dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
+        $dayswithposts_prepared_query = $wpdb->prepare( "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'
-                AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N);
+                AND post_type = %s AND post_status = 'publish'
+                AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", $post_type);
+        $dayswithposts = $wpdb->get_results( $dayswithposts_prepared_query , ARRAY_N);
+
         if ( $dayswithposts ) {
                 foreach ( (array) $dayswithposts as $daywith ) {
                         $daywithpost[] = $daywith[0];
@@ -2073 +2117 @@
         $cache[ $key ] = $calendar_output;
         wp_cache_set( 'get_calendar', $cache, 'calendar' );
 
-        if ( $echo ) {
+        if ( $args['echo'] ) {
                 /**
                  * Filters the HTML calendar output.
                  *