Ticket #10915: 10915.patch

wp-includes/general-template.php

@@ -1126 +1126 @@
                         echo "\n\t</tr>\n\t<tr>\n\t\t";
                 $newrow = false;
 
-                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)) )
+                if ( $day == gmdate('j', current_time('timestamp')) && $thismonth == gmdate('m', current_time('timestamp')) && $thisyear == gmdate('Y', current_time('timestamp')) )
                         echo '<td id="today">';
                 else
                         echo '<td>';

wp-admin/includes/template.php

@@ -2610 +2610 @@
 
         // echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
 
-        $time_adj = time() + (get_option( 'gmt_offset' ) * 3600 );
+        $time_adj = current_time('timestamp');
         $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
         $jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
         $mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );

wp-includes/link-template.php

@@ -286 +286 @@
 function get_year_link($year) {
         global $wp_rewrite;
         if ( !$year )
-                $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
+                $year = gmdate('Y', current_time('timestamp'));
         $yearlink = $wp_rewrite->get_year_permastruct();
         if ( !empty($yearlink) ) {
                 $yearlink = str_replace('%year%', $year, $yearlink);
@@ -308 +308 @@
 function get_month_link($year, $month) {
         global $wp_rewrite;
         if ( !$year )
-                $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
+                $year = gmdate('Y', current_time('timestamp'));
         if ( !$month )
-                $month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
+                $month = gmdate('m', current_time('timestamp'));
         $monthlink = $wp_rewrite->get_month_permastruct();
         if ( !empty($monthlink) ) {
                 $monthlink = str_replace('%year%', $year, $monthlink);
@@ -334 +334 @@
 function get_day_link($year, $month, $day) {
         global $wp_rewrite;
         if ( !$year )
-                $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
+                $year = gmdate('Y', current_time('timestamp'));
         if ( !$month )
-                $month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
+                $month = gmdate('m', current_time('timestamp'));
         if ( !$day )
-                $day = gmdate('j', time()+(get_option('gmt_offset') * 3600));
+                $day = gmdate('j', current_time('timestamp'));
 
         $daylink = $wp_rewrite->get_day_permastruct();
         if ( !empty($daylink) ) {