Changeset 21996 for trunk/wp-includes/functions.php

Timestamp:

09/25/2012 05:26:19 AM (12 years ago)

Author:

nacin

Message:

Introduce constants to allow for easier expression of time periods in seconds. Adds MINUTE_IN_SECONDS, HOUR_IN_SECONDS, DAY_IN_SECONDS, WEEK_IN_SECONDS, YEAR_IN_SECONDS. props nbachiyski, SergeyBiryukov. fixes #20987.

File:

• trunk/wp-includes/functions.php (modified) (5 diffs)

trunk/wp-includes/functions.php

@@ -60 +60 @@
     switch ( $type ) {
         case 'mysql':
-            return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * 3600 ) ) );
+            return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );
             break;
         case 'timestamp':
-            return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * 3600 );
+            return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
             break;
     }
@@ -215 +215 @@
         $weekday += 7;
 
-    $start = $day - 86400 * ( $weekday - $start_of_week ); // The most recent week start day on or before $day
-    $end = $start + 604799; // $start + 7 days - 1 second
+    $start = $day - DAY_IN_SECONDS * ( $weekday - $start_of_week ); // The most recent week start day on or before $day
+    $end = $start + 7 * DAY_IN_SECONDS - 1; // $start + 7 days - 1 second
     return compact( 'start', 'end' );
 }
@@ -935 +935 @@
  */
 function cache_javascript_headers() {
-    $expiresOffset = 864000; // 10 days
+    $expiresOffset = 10 * DAY_IN_SECONDS;
     header( "Content-Type: text/javascript; charset=" . get_bloginfo( 'charset' ) );
     header( "Vary: Accept-Encoding" ); // Handle proxies
@@ -3118 +3118 @@
         return false;
     }
-    return round( timezone_offset_get( $timezone_object, $datetime_object ) / 3600, 2 );
+    return round( timezone_offset_get( $timezone_object, $datetime_object ) / HOUR_IN_SECONDS, 2 );
 }
 
@@ -3318 +3318 @@
     global $wpdb;
 
-    $delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS);
+    $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
 
     $posts_to_delete = $wpdb->get_results($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);