WordPress.org

Make WordPress Core

Changeset 9647


Ignore:
Timestamp:
11/12/08 21:44:55 (5 years ago)
Author:
ryan
Message:

Show user specified offset, not server offset, when displaying time. see #8153

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/options-general.php

    r9616 r9647  
    122122<span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n(__('Y-m-d G:i:s'), false, 'gmt')); ?></span> 
    123123<?php if ($current_offset) : ?> 
    124     <span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n(__('Y-m-d G:i:s'))); ?></span> 
     124    <span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n(__('Y-m-d G:i:s'), current_time('timestamp'), 'gmt')); ?></span> 
    125125<?php endif; ?> 
    126126<br/> 
     
    149149            $custom = FALSE; 
    150150        } 
    151         echo ' /> ' . date_i18n( $format ) . "</label><br />\n"; 
     151        echo ' /> ' . date_i18n( $format, current_time('timestamp'), 'gmt' ) . "</label><br />\n"; 
    152152    } 
    153153 
    154154    echo '  <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"'; 
    155155    checked( $custom, TRUE ); 
    156     echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" class="small-text" /> ' . date_i18n( get_option('date_format') ) . "\n"; 
     156    echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" class="small-text" /> ' . date_i18n( get_option('date_format'), current_time('timestamp'), 'gmt' ) . "\n"; 
    157157 
    158158    echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') . "</p>\n"; 
     
    181181            $custom = FALSE; 
    182182        } 
    183         echo ' /> ' . date_i18n( $format ) . "</label><br />\n"; 
     183        echo ' /> ' . date_i18n( $format, current_time('timestamp'), 'gmt' ) . "</label><br />\n"; 
    184184    } 
    185185 
    186186    echo '  <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"'; 
    187187    checked( $custom, TRUE ); 
    188     echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" class="small-text" /> ' . date_i18n( get_option('time_format') ) . "\n"; 
     188    echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" class="small-text" /> ' . date_i18n( get_option('time_format'), current_time('timestamp'), 'gmt' ) . "\n"; 
    189189?> 
    190190    </fieldset> 
Note: See TracChangeset for help on using the changeset viewer.