Changeset 12590

Timestamp:

12/30/2009 05:56:09 PM (15 years ago)

Author:

ryan

Message:

Use current_time() to calculate current time. Props filosofo. fixes #10915

Location:

trunk

Files:

• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (3 diffs)

trunk/wp-admin/includes/template.php

@@ -2611 +2611 @@
     // 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 );

trunk/wp-includes/general-template.php

@@ -1124 +1124 @@
         $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

trunk/wp-includes/link-template.php

@@ -290 +290 @@
     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) ) {
@@ -312 +312 @@
     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) ) {
@@ -338 +338 @@
     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();