Code standards cleanup for wp-admin/options-general.php

git-svn-id: https://develop.svn.wordpress.org/trunk@13606 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2010-03-06 09:49:11 +00:00
parent 6200c24c13
commit ea2b254de0
1 changed files with 18 additions and 15 deletions

View File

@ -192,21 +192,24 @@ if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
<span> <span>
<?php <?php
$now = localtime(time(), true); $now = localtime(time(), true);
if ($now['tm_isdst']) _e('This timezone is currently in daylight saving time.'); if ( $now['tm_isdst'] )
else _e('This timezone is currently in standard time.'); _e('This timezone is currently in daylight saving time.');
else
_e('This timezone is currently in standard time.');
?> ?>
<br /> <br />
<?php <?php
if ( function_exists('timezone_transitions_get') ) { if ( function_exists('timezone_transitions_get') ) {
$dateTimeZoneSelected = new DateTimeZone($tzstring); $found = false;
foreach (timezone_transitions_get($dateTimeZoneSelected) as $tr) { $date_time_zone_selected = new DateTimeZone($tzstring);
foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
if ( $tr['ts'] > time() ) { if ( $tr['ts'] > time() ) {
$found = true; $found = true;
break; break;
} }
} }
if ( isset($found) && $found === true ) { if ( $found ) {
echo ' '; echo ' ';
$message = $tr['isdst'] ? $message = $tr['isdst'] ?
__('Daylight saving time begins on: <code>%s</code>.') : __('Daylight saving time begins on: <code>%s</code>.') :
@ -236,13 +239,13 @@ if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
'd/m/Y', 'd/m/Y',
) ); ) );
$custom = TRUE; $custom = true;
foreach ( $date_formats as $format ) { foreach ( $date_formats as $format ) {
echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='date_format' value='" . esc_attr($format) . "'"; echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='date_format' value='" . esc_attr($format) . "'";
if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "===" if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "==="
echo " checked='checked'"; echo " checked='checked'";
$custom = FALSE; $custom = false;
} }
echo ' /> ' . date_i18n( $format ) . "</label><br />\n"; echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
} }
@ -268,13 +271,13 @@ if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
'H:i', 'H:i',
) ); ) );
$custom = TRUE; $custom = true;
foreach ( $time_formats as $format ) { foreach ( $time_formats as $format ) {
echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='time_format' value='" . esc_attr($format) . "'"; echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='time_format' value='" . esc_attr($format) . "'";
if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "===" if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "==="
echo " checked='checked'"; echo " checked='checked'";
$custom = FALSE; $custom = false;
} }
echo ' /> ' . date_i18n( $format ) . "</label><br />\n"; echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
} }