<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13606] trunk/wp-admin/options-general.php:
Code standards cleanup for wp-admin/options-general.php</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13606">13606</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-06 09:49:11 +0000 (Sat, 06 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Code standards cleanup for wp-admin/options-general.php</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (13605 => 13606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-03-06 09:47:38 UTC (rev 13605)
+++ trunk/wp-admin/options-general.php 2010-03-06 09:49:11 UTC (rev 13606)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> if ( false !== strpos($tzstring,'Etc/GMT') )
</span><span class="cx"> $tzstring = '';
</span><span class="cx">
</span><del>-if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
</del><ins>+if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
</ins><span class="cx"> $check_zone_info = false;
</span><span class="cx"> if ( 0 == $current_offset )
</span><span class="cx"> $tzstring = 'UTC+0';
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> </select>
</span><span class="cx">
</span><span class="cx"> <span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n($timezone_format, false, 'gmt')); ?></span>
</span><del>-<?php if (get_option('timezone_string')) : ?>
</del><ins>+<?php if ( get_option('timezone_string') ) : ?>
</ins><span class="cx"> <span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <br />
</span><span class="lines">@@ -191,27 +191,30 @@
</span><span class="cx"> <br />
</span><span class="cx"> <span>
</span><span class="cx"> <?php
</span><del>- $now = localtime(time(),true);
- if ($now['tm_isdst']) _e('This timezone is currently in daylight saving time.');
- else _e('This timezone is currently in standard time.');
</del><ins>+ $now = localtime(time(), true);
+ if ( $now['tm_isdst'] )
+ _e('This timezone is currently in daylight saving time.');
+ else
+ _e('This timezone is currently in standard time.');
</ins><span class="cx"> ?>
</span><span class="cx"> <br />
</span><span class="cx"> <?php
</span><del>- if (function_exists('timezone_transitions_get')) {
- $dateTimeZoneSelected = new DateTimeZone($tzstring);
- foreach (timezone_transitions_get($dateTimeZoneSelected) as $tr) {
- if ($tr['ts'] > time()) {
</del><ins>+ if ( function_exists('timezone_transitions_get') ) {
+ $found = false;
+ $date_time_zone_selected = new DateTimeZone($tzstring);
+ foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
+ if ( $tr['ts'] > time() ) {
</ins><span class="cx"> $found = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($found) && $found === true ) {
</del><ins>+ if ( $found ) {
</ins><span class="cx"> echo ' ';
</span><span class="cx"> $message = $tr['isdst'] ?
</span><span class="cx"> __('Daylight saving time begins on: <code>%s</code>.') :
</span><span class="cx"> __('Standard time begins on: <code>%s</code>.');
</span><del>- printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $tr['ts'] ) );
</del><ins>+ printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] ) );
</ins><span class="cx"> } else {
</span><span class="cx"> _e('This timezone does not observe daylight saving time.');
</span><span class="cx"> }
</span><span class="lines">@@ -236,13 +239,13 @@
</span><span class="cx"> 'd/m/Y',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $custom = TRUE;
</del><ins>+ $custom = true;
</ins><span class="cx">
</span><span class="cx"> foreach ( $date_formats as $format ) {
</span><span class="cx"> echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='date_format' value='" . esc_attr($format) . "'";
</span><span class="cx"> if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "==="
</span><span class="cx"> echo " checked='checked'";
</span><del>- $custom = FALSE;
</del><ins>+ $custom = false;
</ins><span class="cx"> }
</span><span class="cx"> echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
</span><span class="cx"> }
</span><span class="lines">@@ -268,13 +271,13 @@
</span><span class="cx"> 'H:i',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $custom = TRUE;
</del><ins>+ $custom = true;
</ins><span class="cx">
</span><span class="cx"> foreach ( $time_formats as $format ) {
</span><span class="cx"> echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='time_format' value='" . esc_attr($format) . "'";
</span><span class="cx"> if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "==="
</span><span class="cx"> echo " checked='checked'";
</span><del>- $custom = FALSE;
</del><ins>+ $custom = false;
</ins><span class="cx"> }
</span><span class="cx"> echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>