diff --git wp-includes/general-template.php wp-includes/general-template.php index 21e54c3..457b9d6 100644 --- wp-includes/general-template.php +++ wp-includes/general-template.php @@ -1070,43 +1070,65 @@ function calendar_week_mod($num) { * @since 1.0.0 * * @param bool $initial Optional, default is true. Use initial calendar names. - * @param bool $echo Optional, default is true. Set to false for return. + * @param Mixed $args Optional, check the $defaults inside function body */ -function get_calendar($initial = true, $echo = true) { +function get_calendar( $initial = true, $args = true ) { global $wpdb, $m, $monthnum, $year, $wp_locale, $posts; - + + $defaults = array( + 'echo' => true, + 'post_type' => 'post', + 'post_status' => 'publish' + ); + + // Backcompat support + if ( is_bool( $args ) ) + $echo = $args; + elseif ( is_array( $args ) ) { + $cal_args = wp_parse_args( $args, $defaults ); + extract( $cal_args, EXTR_SKIP ); + } + + // Generate a cache/hooks name like `get_calendar-post_type` preserving backcompat + $cal_name = 'get_calendar' . ( $post_type != 'post' ) ? '_' . $post_type : ''; + $cache = array(); $key = md5( $m . $monthnum . $year ); - if ( $cache = wp_cache_get( 'get_calendar', 'calendar' ) ) { + if ( $cache = wp_cache_get( $cal_name, 'calendar' ) ) { if ( is_array($cache) && isset( $cache[ $key ] ) ) { if ( $echo ) { - echo apply_filters( 'get_calendar', $cache[$key] ); + echo apply_filters( $cal_name, $cache[$key] ); return; } else { - return apply_filters( 'get_calendar', $cache[$key] ); + return apply_filters( $cal_name, $cache[$key] ); } } } - + if ( !is_array($cache) ) $cache = array(); - + // 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( + $wpdb->prepare( + "SELECT 1 as test FROM `$wpdb->posts` WHERE `post_type` = %s AND `post_status` = %s LIMIT 1", + $post_type, $post_status + ) + ); if ( !$gotsome ) { $cache[ $key ] = ''; - wp_cache_set( 'get_calendar', $cache, 'calendar' ); + wp_cache_set( $cal_name, $cache, 'calendar' ); return; } } - + if ( isset($_GET['w']) ) $w = ''.intval($_GET['w']); - + // week_begins = 0 stands for Sunday $week_begins = intval(get_option('start_of_week')); - + // Let's figure out when we are if ( !empty($monthnum) && !empty($year) ) { $thismonth = ''.zeroise(intval($monthnum), 2); @@ -1115,7 +1137,12 @@ function get_calendar($initial = true, $echo = true) { // We need to get the month from MySQL $thisyear = ''.intval(substr($m, 0, 4)); $d = (($w - 1) * 7) + 6; //it seems MySQL's weeks disagree with PHP's - $thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')"); + $thismonth = $wpdb->get_var( + $wpdb->prepare( + "SELECT DATE_FORMAT((DATE_ADD(%s, INTERVAL %d DAY) ), '%m')", + $thisyear . '0101', $d + ) + ); } elseif ( !empty($m) ) { $thisyear = ''.intval(substr($m, 0, 4)); if ( strlen($m) < 6 ) @@ -1126,76 +1153,88 @@ function get_calendar($initial = true, $echo = true) { $thisyear = gmdate('Y', current_time('timestamp')); $thismonth = gmdate('m', current_time('timestamp')); } - + $unixmonth = mktime(0, 0 , 0, $thismonth, 1, $thisyear); $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 - 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 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"); - + $previous = $wpdb->get_row( + $wpdb->prepare( + "SELECT MONTH(post_date) AS `month`, YEAR(post_date) AS `year` + FROM $wpdb->posts WHERE `post_date` < %s + AND `post_type` = %s AND `post_status` = %s + ORDER BY `post_date` DESC LIMIT 1", + $thisyear . '-' . $thismonth . '-01', $post_type, $post_status + ) + ); + $next = $wpdb->get_row( + $wpdb->prepare( + "SELECT MONTH(post_date) AS `month`, YEAR(post_date) AS `year` + FROM $wpdb->posts WHERE `post_date` > %s + AND `post_type` = %s AND `post_status` = %s ORDER BY `post_date` ASC LIMIT 1", + $thisyear . '-' . $thismonth . '-' . $last_day . '23:59:59', $post_type, $post_status + ) + ); + /* translators: Calendar caption: 1: month name, 2: 4-digit year */ $calendar_caption = _x('%1$s %2$s', 'calendar caption'); - $calendar_output = ' + $calendar_output = '
'; - + $myweek = array(); - + for ( $wdcount=0; $wdcount<=6; $wdcount++ ) { $myweek[] = $wp_locale->get_weekday(($wdcount+$week_begins)%7); } - + foreach ( $myweek as $wd ) { $day_name = (true == $initial) ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd); $wd = esc_attr($wd); $calendar_output .= "\n\t\t"; } - + $calendar_output .= ' - + '; - + if ( $previous ) { $calendar_output .= "\n\t\t".''; } else { $calendar_output .= "\n\t\t".''; } - + $calendar_output .= "\n\t\t".''; - + if ( $next ) { $calendar_output .= "\n\t\t".''; } else { $calendar_output .= "\n\t\t".''; } - + $calendar_output .= ' - + '; - + // 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' - AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N); + $dayswithposts = $wpdb->get_results( + $wpdb->prepare( + "SELECT DISTINCT DAYOFMONTH(post_date) + FROM $wpdb->posts WHERE `post_date` >= %s + AND `post_type` = %s AND post_status = %s + AND `post_date` <= %s", + $thisyear . '-' . $thismonth . '-01 00:00:00', + $post_type, $post_status, + $thisyear . '-' . $thismonth . '-' . $last_day . ' 23:59:59' + ), ARRAY_N + ); if ( $dayswithposts ) { foreach ( (array) $dayswithposts as $daywith ) { $daywithpost[] = $daywith[0]; @@ -1203,24 +1242,29 @@ function get_calendar($initial = true, $echo = true) { } else { $daywithpost = array(); } - + if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'camino') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false) $ak_title_separator = "\n"; else $ak_title_separator = ', '; - + $ak_titles_for_day = array(); - $ak_post_titles = $wpdb->get_results("SELECT ID, post_title, DAYOFMONTH(post_date) as dom " - ."FROM $wpdb->posts " - ."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'" + $ak_post_titles = $wpdb->get_results( + $wpdb->prepare( + "SELECT `ID`, `post_title`, DAYOFMONTH(post_date) as `dom` + FROM $wpdb->posts + WHERE `post_date` >= %s + AND `post_date` <= %s + AND `post_type` = %s AND `post_status` = %s", + $thisyear . '-' . $thismonth . '-01 00:00:00', + $thisyear . '-' . $thismonth . '-' . $last_day . ' 23:59:59', + $post_type, $post_status + ) ); if ( $ak_post_titles ) { foreach ( (array) $ak_post_titles as $ak_post_title ) { - $post_title = esc_attr( apply_filters( 'the_title', $ak_post_title->post_title, $ak_post_title->ID ) ); - + if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) ) $ak_titles_for_day['day_'.$ak_post_title->dom] = ''; if ( empty($ak_titles_for_day["$ak_post_title->dom"]) ) // first one @@ -1229,48 +1273,47 @@ function get_calendar($initial = true, $echo = true) { $ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . $post_title; } } - - + + // See how much we should pad in the beginning $pad = calendar_week_mod(date('w', $unixmonth)-$week_begins); if ( 0 != $pad ) $calendar_output .= "\n\t\t".''; - + $daysinmonth = intval(date('t', $unixmonth)); for ( $day = 1; $day <= $daysinmonth; ++$day ) { if ( isset($newrow) && $newrow ) $calendar_output .= "\n\t\n\t\n\t\t"; $newrow = false; - + if ( $day == gmdate('j', current_time('timestamp')) && $thismonth == gmdate('m', current_time('timestamp')) && $thisyear == gmdate('Y', current_time('timestamp')) ) $calendar_output .= ''; - + if ( 6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins) ) $newrow = true; } - + $pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins); if ( $pad != 0 && $pad != 7 ) $calendar_output .= "\n\t\t".''; - + $calendar_output .= "\n\t\n\t\n\t
' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '
$day_name
« ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '  ' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' » 
 
'; else $calendar_output .= ''; - + if ( in_array($day, $daywithpost) ) // any posts today? $calendar_output .= '$day"; else $calendar_output .= $day; $calendar_output .= ' 
"; - + $cache[ $key ] = $calendar_output; - wp_cache_set( 'get_calendar', $cache, 'calendar' ); - + wp_cache_set( $cal_name, $cache, 'calendar' ); + if ( $echo ) - echo apply_filters( 'get_calendar', $calendar_output ); + echo apply_filters( $cal_name, $calendar_output ); else - return apply_filters( 'get_calendar', $calendar_output ); - + return apply_filters( $cal_name, $calendar_output ); } /**