Remove PHP4 timezone support. Props hakre. fixes #16970
git-svn-id: https://develop.svn.wordpress.org/trunk@17637 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
0e80d3e440
commit
95d1619373
|
@ -135,44 +135,6 @@ if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<tr>
|
<tr>
|
||||||
<?php
|
<?php
|
||||||
if ( !wp_timezone_supported() ) : // no magic timezone support here
|
|
||||||
?>
|
|
||||||
<th scope="row"><label for="gmt_offset"><?php _e('Timezone') ?> </label></th>
|
|
||||||
<td>
|
|
||||||
<select name="gmt_offset" id="gmt_offset">
|
|
||||||
<?php
|
|
||||||
$current_offset = get_option('gmt_offset');
|
|
||||||
$offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
|
|
||||||
0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
|
|
||||||
foreach ( $offset_range as $offset ) {
|
|
||||||
if ( 0 < $offset )
|
|
||||||
$offset_name = '+' . $offset;
|
|
||||||
elseif ( 0 == $offset )
|
|
||||||
$offset_name = '';
|
|
||||||
else
|
|
||||||
$offset_name = (string) $offset;
|
|
||||||
|
|
||||||
$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
|
|
||||||
|
|
||||||
$selected = '';
|
|
||||||
if ( $current_offset == $offset ) {
|
|
||||||
$selected = " selected='selected'";
|
|
||||||
$current_offset_name = $offset_name;
|
|
||||||
}
|
|
||||||
echo "<option value=\"" . esc_attr($offset) . "\"$selected>" . sprintf(__('UTC %s'), $offset_name) . '</option>';
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</select>
|
|
||||||
<?php _e('hours'); ?>
|
|
||||||
<span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n( $time_format, false, 'gmt')); ?></span>
|
|
||||||
<?php if ($current_offset) : ?>
|
|
||||||
<span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n($time_format)); ?></span>
|
|
||||||
<?php endif; ?>
|
|
||||||
<br />
|
|
||||||
<span class="description"><?php _e('Unfortunately, you have to manually update this for daylight saving time. The PHP Date/Time library is not supported by your web host.'); ?></span>
|
|
||||||
</td>
|
|
||||||
<?php
|
|
||||||
else: // looks like we can do nice timezone selection!
|
|
||||||
$current_offset = get_option('gmt_offset');
|
$current_offset = get_option('gmt_offset');
|
||||||
$tzstring = get_option('timezone_string');
|
$tzstring = get_option('timezone_string');
|
||||||
|
|
||||||
|
@ -250,7 +212,6 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<?php endif; ?>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row"><?php _e('Date Format') ?></th>
|
<th scope="row"><?php _e('Date Format') ?></th>
|
||||||
|
|
|
@ -2618,4 +2618,18 @@ function wp_clone( $object ) {
|
||||||
_deprecated_function( __FUNCTION__, '3.2' );
|
_deprecated_function( __FUNCTION__, '3.2' );
|
||||||
|
|
||||||
return clone $object;
|
return clone $object;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check for PHP timezone support
|
||||||
|
*
|
||||||
|
* @since 2.9.0
|
||||||
|
* @deprecated 3.2
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
function wp_timezone_supported() {
|
||||||
|
_deprecated_function( __FUNCTION__, '3.2' );
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
|
@ -120,7 +120,7 @@ function date_i18n( $dateformatstring, $unixtimestamp = false, $gmt = false ) {
|
||||||
}
|
}
|
||||||
$timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
|
$timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
|
||||||
$timezone_formats_re = implode( '|', $timezone_formats );
|
$timezone_formats_re = implode( '|', $timezone_formats );
|
||||||
if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) && wp_timezone_supported() ) {
|
if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) ) {
|
||||||
$timezone_string = get_option( 'timezone_string' );
|
$timezone_string = get_option( 'timezone_string' );
|
||||||
if ( $timezone_string ) {
|
if ( $timezone_string ) {
|
||||||
$timezone_object = timezone_open( $timezone_string );
|
$timezone_object = timezone_open( $timezone_string );
|
||||||
|
@ -4062,9 +4062,6 @@ function global_terms_enabled() {
|
||||||
* @return float|bool
|
* @return float|bool
|
||||||
*/
|
*/
|
||||||
function wp_timezone_override_offset() {
|
function wp_timezone_override_offset() {
|
||||||
if ( !wp_timezone_supported() ) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if ( !$timezone_string = get_option( 'timezone_string' ) ) {
|
if ( !$timezone_string = get_option( 'timezone_string' ) ) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -4077,27 +4074,6 @@ function wp_timezone_override_offset() {
|
||||||
return round( timezone_offset_get( $timezone_object, $datetime_object ) / 3600, 2 );
|
return round( timezone_offset_get( $timezone_object, $datetime_object ) / 3600, 2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Check for PHP timezone support
|
|
||||||
*
|
|
||||||
* @since 2.9.0
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
function wp_timezone_supported() {
|
|
||||||
$support = false;
|
|
||||||
if (
|
|
||||||
function_exists( 'date_create' ) &&
|
|
||||||
function_exists( 'date_default_timezone_set' ) &&
|
|
||||||
function_exists( 'timezone_identifiers_list' ) &&
|
|
||||||
function_exists( 'timezone_open' ) &&
|
|
||||||
function_exists( 'timezone_offset_get' )
|
|
||||||
) {
|
|
||||||
$support = true;
|
|
||||||
}
|
|
||||||
return apply_filters( 'timezone_support', $support );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@internal Missing Short Description}}
|
* {@internal Missing Short Description}}
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue