Changeset 44809 for trunk/src/wp-admin/includes/template.php

Timestamp:

03/07/2019 09:11:37 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Reduce explicit local current_time( 'timestamp' ) usage in favor of native PHP functions.

Timestamps don't carry any timezone information, using the intended format directly simplifies the logic and makes the code less confusing.

Props Rarst, jdgrimes.
See #40657.

File:

• trunk/src/wp-admin/includes/template.php (modified) (1 diff)

trunk/src/wp-admin/includes/template.php

@@ -775 +775 @@
     // 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  = current_time( 'timestamp' );
     $post_date = ( $for_post ) ? $post->post_date : get_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 );
-    $aa        = ( $edit ) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
-    $hh        = ( $edit ) ? mysql2date( 'H', $post_date, false ) : gmdate( 'H', $time_adj );
-    $mn        = ( $edit ) ? mysql2date( 'i', $post_date, false ) : gmdate( 'i', $time_adj );
-    $ss        = ( $edit ) ? mysql2date( 's', $post_date, false ) : gmdate( 's', $time_adj );
-
-    $cur_jj = gmdate( 'd', $time_adj );
-    $cur_mm = gmdate( 'm', $time_adj );
-    $cur_aa = gmdate( 'Y', $time_adj );
-    $cur_hh = gmdate( 'H', $time_adj );
-    $cur_mn = gmdate( 'i', $time_adj );
+    $jj        = ( $edit ) ? mysql2date( 'd', $post_date, false ) : current_time( 'd' );
+    $mm        = ( $edit ) ? mysql2date( 'm', $post_date, false ) : current_time( 'm' );
+    $aa        = ( $edit ) ? mysql2date( 'Y', $post_date, false ) : current_time( 'Y' );
+    $hh        = ( $edit ) ? mysql2date( 'H', $post_date, false ) : current_time( 'H' );
+    $mn        = ( $edit ) ? mysql2date( 'i', $post_date, false ) : current_time( 'i' );
+    $ss        = ( $edit ) ? mysql2date( 's', $post_date, false ) : current_time( 's' );
+
+    $cur_jj = current_time( 'd' );
+    $cur_mm = current_time( 'm' );
+    $cur_aa = current_time( 'Y' );
+    $cur_hh = current_time( 'H' );
+    $cur_mn = current_time( 'i' );
 
     $month = '<label><span class="screen-reader-text">' . __( 'Month' ) . '</span><select ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";