diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 3d437ed024..9d22905b8c 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -1611,64 +1611,69 @@ function calendar_week_mod($num) { * @param bool $echo Optional, default is true. Set to false for return. * @return string|void String when retrieving. */ -function get_calendar($initial = true, $echo = true) { +function get_calendar( $initial = true, $echo = true ) { global $wpdb, $m, $monthnum, $year, $wp_locale, $posts; $key = md5( $m . $monthnum . $year ); - if ( $cache = wp_cache_get( 'get_calendar', 'calendar' ) ) { - if ( is_array($cache) && isset( $cache[ $key ] ) ) { - if ( $echo ) { - /** This filter is documented in wp-includes/general-template.php */ - echo apply_filters( 'get_calendar', $cache[$key] ); - return; - } else { - /** This filter is documented in wp-includes/general-template.php */ - return apply_filters( 'get_calendar', $cache[$key] ); - } + $cache = wp_cache_get( 'get_calendar', 'calendar' ); + + if ( $cache && is_array( $cache ) && isset( $cache[ $key ] ) ) { + /** This filter is documented in wp-includes/general-template.php */ + $output = apply_filters( 'get_calendar', $cache[ $key ] ); + + if ( $echo ) { + echo $output; + return; } + + return $output; } - if ( !is_array($cache) ) + if ( ! is_array( $cache ) ) { $cache = array(); + } // Quick check. If we have no posts at all, abort! - if ( !$posts ) { + if ( ! $posts ) { $gotsome = $wpdb->get_var("SELECT 1 as test FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1"); - if ( !$gotsome ) { + if ( ! $gotsome ) { $cache[ $key ] = ''; wp_cache_set( 'get_calendar', $cache, 'calendar' ); return; } } - if ( isset($_GET['w']) ) - $w = ''.intval($_GET['w']); - + if ( isset( $_GET['w'] ) ) { + $w = (int) $_GET['w']; + } // week_begins = 0 stands for Sunday - $week_begins = intval(get_option('start_of_week')); + $week_begins = (int) get_option( 'start_of_week' ); + $ts = current_time( 'timestamp' ); // Let's figure out when we are - if ( !empty($monthnum) && !empty($year) ) { - $thismonth = ''.zeroise(intval($monthnum), 2); - $thisyear = ''.intval($year); - } elseif ( !empty($w) ) { + if ( ! empty( $monthnum ) && ! empty( $year ) ) { + $thismonth = zeroise( intval( $monthnum ), 2 ); + $thisyear = (int) $year; + } elseif ( ! empty( $w ) ) { // 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 + $thisyear = (int) substr( $m, 0, 4 ); + //it seems MySQL's weeks disagree with PHP's + $d = ( ( $w - 1 ) * 7 ) + 6; $thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')"); - } elseif ( !empty($m) ) { - $thisyear = ''.intval(substr($m, 0, 4)); - if ( strlen($m) < 6 ) - $thismonth = '01'; - else - $thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2); + } elseif ( ! empty( $m ) ) { + $thisyear = (int) substr( $m, 0, 4 ); + if ( strlen( $m ) < 6 ) { + $thismonth = '01'; + } else { + $thismonth = zeroise( (int) substr( $m, 4, 2 ), 2 ); + } } else { - $thisyear = gmdate('Y', current_time('timestamp')); - $thismonth = gmdate('m', current_time('timestamp')); + $thisyear = gmdate( 'Y', $ts ); + $thismonth = gmdate( 'm', $ts ); } - $unixmonth = mktime(0, 0 , 0, $thismonth, 1, $thisyear); - $last_day = date('t', $unixmonth); + $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 @@ -1687,19 +1692,23 @@ function get_calendar($initial = true, $echo = true) { /* translators: Calendar caption: 1: month name, 2: 4-digit year */ $calendar_caption = _x('%1$s %2$s', 'calendar caption'); $calendar_output = ' - + '; $myweek = array(); - for ( $wdcount=0; $wdcount<=6; $wdcount++ ) { - $myweek[] = $wp_locale->get_weekday(($wdcount+$week_begins)%7); + for ( $wdcount = 0; $wdcount <= 6; $wdcount++ ) { + $myweek[] = $wp_locale->get_weekday( ( $wdcount + $week_begins ) % 7 ); } foreach ( $myweek as $wd ) { - $day_name = $initial ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd); - $wd = esc_attr($wd); + $day_name = $initial ? $wp_locale->get_weekday_initial( $wd ) : $wp_locale->get_weekday_abbrev( $wd ); + $wd = esc_attr( $wd ); $calendar_output .= "\n\t\t"; } @@ -1711,7 +1720,9 @@ function get_calendar($initial = true, $echo = true) { '; if ( $previous ) { - $calendar_output .= "\n\t\t".''; + $calendar_output .= "\n\t\t".''; } else { $calendar_output .= "\n\t\t".''; } @@ -1719,7 +1730,9 @@ function get_calendar($initial = true, $echo = true) { $calendar_output .= "\n\t\t".''; if ( $next ) { - $calendar_output .= "\n\t\t".''; + $calendar_output .= "\n\t\t".''; } else { $calendar_output .= "\n\t\t".''; } @@ -1744,63 +1757,53 @@ function get_calendar($initial = true, $echo = true) { } } - 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 = ', '; + // 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".''; + } - $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'" - ); - if ( $ak_post_titles ) { - foreach ( (array) $ak_post_titles as $ak_post_title ) { + $newrow = false; + $daysinmonth = (int) date( 't', $unixmonth ); - /** This filter is documented in wp-includes/post-template.php */ - $post_title = esc_attr( apply_filters( 'the_title', $ak_post_title->post_title, $ak_post_title->ID ) ); + for ( $day = 1; $day <= $daysinmonth; ++$day ) { + if ( isset($newrow) && $newrow ) { + $calendar_output .= "\n\t\n\t\n\t\t"; + } + $newrow = false; - 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 - $ak_titles_for_day["$ak_post_title->dom"] = $post_title; - else - $ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . $post_title; + if ( $day == gmdate( 'j', $ts ) && + $thismonth == gmdate( 'm', $ts ) && + $thisyear == gmdate( 'Y', $ts ) ) { + $calendar_output .= ''; + + if ( 6 == calendar_week_mod( date( 'w', mktime(0, 0 , 0, $thismonth, $day, $thisyear ) ) - $week_begins ) ) { + $newrow = true; } } - // 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".''; } - - $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)) . '' . 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( $previous->month ) ) . + '  ' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' »' . + $wp_locale->get_month_abbrev( $wp_locale->get_month( $next->month ) ) . + ' »  
'; + } else { + $calendar_output .= ''; + } + + if ( in_array( $day, $daywithpost ) ) { + // any posts today? + $date_format = date( _x( 'F j, Y', 'daily archives date format' ), strtotime( "{$thisyear}-{$thismonth}-{$day}" ) ); + $label = sprintf( __( 'Posts published on %s' ), $date_format ); + $calendar_output .= sprintf( + '%s', + get_day_link( $thisyear, $thismonth, $day ), + esc_attr( $label ), + $day + ); + } else { + $calendar_output .= $day; + } + $calendar_output .= ' 
'; - else - $calendar_output .= ''; - - if ( in_array($day, $daywithpost) ) // any posts today? - $calendar_output .= '$day"; - else - $calendar_output .= $day; - $calendar_output .= '  
"; $cache[ $key ] = $calendar_output; @@ -1815,11 +1818,10 @@ function get_calendar($initial = true, $echo = true) { * @param string $calendar_output HTML output of the calendar. */ echo apply_filters( 'get_calendar', $calendar_output ); - } else { - /** This filter is documented in wp-includes/general-template.php */ - return apply_filters( 'get_calendar', $calendar_output ); + return; } - + /** This filter is documented in wp-includes/general-template.php */ + return apply_filters( 'get_calendar', $calendar_output ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 4ee084d7d4..19ea5909b2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34462'; +$wp_version = '4.4-alpha-34463'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.