Ticket #10575: general-template.php.diff
| File general-template.php.diff, 4.5 KB (added by , 17 years ago) |
|---|
-
general-template.php
old new 977 977 } 978 978 } 979 979 980 ob_start();980 $output = ''; 981 981 if ( isset($_GET['w']) ) 982 982 $w = ''.intval($_GET['w']); 983 983 … … 1023 1023 1024 1024 /* translators: Calendar caption: 1: month name, 2: 4-digit year */ 1025 1025 $calendar_caption = _x('%1$s %2$s', 'calendar caption'); 1026 echo'<table id="wp-calendar" summary="' . __('Calendar') . '">1026 $output .= '<table id="wp-calendar" summary="' . __('Calendar') . '"> 1027 1027 <caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption> 1028 1028 <thead> 1029 1029 <tr>'; … … 1036 1036 1037 1037 foreach ( $myweek as $wd ) { 1038 1038 $day_name = (true == $initial) ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd); 1039 echo"\n\t\t<th abbr=\"$wd\" scope=\"col\" title=\"$wd\">$day_name</th>";1039 $output .= "\n\t\t<th abbr=\"$wd\" scope=\"col\" title=\"$wd\">$day_name</th>"; 1040 1040 } 1041 1041 1042 echo'1042 $output .= ' 1043 1043 </tr> 1044 1044 </thead> 1045 1045 … … 1047 1047 <tr>'; 1048 1048 1049 1049 if ( $previous ) { 1050 echo"\n\t\t".'<td abbr="' . $wp_locale->get_month($previous->month) . '" colspan="3" id="prev"><a href="' .1050 $output .= "\n\t\t".'<td abbr="' . $wp_locale->get_month($previous->month) . '" colspan="3" id="prev"><a href="' . 1051 1051 get_month_link($previous->year, $previous->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($previous->month), 1052 1052 date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">« ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '</a></td>'; 1053 1053 } else { 1054 echo"\n\t\t".'<td colspan="3" id="prev" class="pad"> </td>';1054 $output .= "\n\t\t".'<td colspan="3" id="prev" class="pad"> </td>'; 1055 1055 } 1056 1056 1057 echo"\n\t\t".'<td class="pad"> </td>';1057 $output .= "\n\t\t".'<td class="pad"> </td>'; 1058 1058 1059 1059 if ( $next ) { 1060 echo"\n\t\t".'<td abbr="' . $wp_locale->get_month($next->month) . '" colspan="3" id="next"><a href="' .1060 $output .= "\n\t\t".'<td abbr="' . $wp_locale->get_month($next->month) . '" colspan="3" id="next"><a href="' . 1061 1061 get_month_link($next->year, $next->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($next->month), 1062 1062 date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year))) . '">' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' »</a></td>'; 1063 1063 } else { 1064 echo"\n\t\t".'<td colspan="3" id="next" class="pad"> </td>';1064 $output .= "\n\t\t".'<td colspan="3" id="next" class="pad"> </td>'; 1065 1065 } 1066 1066 1067 echo'1067 $output .= ' 1068 1068 </tr> 1069 1069 </tfoot> 1070 1070 … … 1116 1116 // See how much we should pad in the beginning 1117 1117 $pad = calendar_week_mod(date('w', $unixmonth)-$week_begins); 1118 1118 if ( 0 != $pad ) 1119 echo"\n\t\t".'<td colspan="'.$pad.'" class="pad"> </td>';1119 $output .= "\n\t\t".'<td colspan="'.$pad.'" class="pad"> </td>'; 1120 1120 1121 1121 $daysinmonth = intval(date('t', $unixmonth)); 1122 1122 for ( $day = 1; $day <= $daysinmonth; ++$day ) { 1123 1123 if ( isset($newrow) && $newrow ) 1124 echo"\n\t</tr>\n\t<tr>\n\t\t";1124 $output .= "\n\t</tr>\n\t<tr>\n\t\t"; 1125 1125 $newrow = false; 1126 1126 1127 1127 if ( $day == gmdate('j', (time() + (get_option('gmt_offset') * 3600))) && $thismonth == gmdate('m', time()+(get_option('gmt_offset') * 3600)) && $thisyear == gmdate('Y', time()+(get_option('gmt_offset') * 3600)) ) 1128 echo'<td id="today">';1128 $output .= '<td id="today">'; 1129 1129 else 1130 echo'<td>';1130 $output .= '<td>'; 1131 1131 1132 1132 if ( in_array($day, $daywithpost) ) // any posts today? 1133 echo'<a href="' . get_day_link($thisyear, $thismonth, $day) . "\" title=\"$ak_titles_for_day[$day]\">$day</a>";1133 $output .= '<a href="' . get_day_link($thisyear, $thismonth, $day) . "\" title=\"$ak_titles_for_day[$day]\">$day</a>"; 1134 1134 else 1135 echo$day;1136 echo'</td>';1135 $output .= $day; 1136 $output .= '</td>'; 1137 1137 1138 1138 if ( 6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins) ) 1139 1139 $newrow = true; … … 1141 1141 1142 1142 $pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins); 1143 1143 if ( $pad != 0 && $pad != 7 ) 1144 echo"\n\t\t".'<td class="pad" colspan="'.$pad.'"> </td>';1144 $output .= "\n\t\t".'<td class="pad" colspan="'.$pad.'"> </td>'; 1145 1145 1146 echo"\n\t</tr>\n\t</tbody>\n\t</table>";1146 $output .= "\n\t</tr>\n\t</tbody>\n\t</table>"; 1147 1147 1148 $output = ob_get_contents(); 1149 ob_end_clean(); 1148 $output = apply_filters( 'get_calendar', $output ); 1150 1149 echo $output; 1151 1150 $cache[ $key ] = $output; 1152 1151 wp_cache_set( 'get_calendar', $cache, 'calendar' );