diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 57a1b149ae..45eb055ff4 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -135,44 +135,6 @@ if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?> - - - - -UTC time is %s'), date_i18n( $time_format, false, 'gmt')); ?> - - %2$s'), $current_offset_name, date_i18n($time_format)); ?> - -
- - - - diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index bc2f7a0a1b..e53bc5d7cf 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -2618,4 +2618,18 @@ function wp_clone( $object ) { _deprecated_function( __FUNCTION__, '3.2' ); return clone $object; -} \ No newline at end of file +} + +/** + * 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; +} diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 7abe4525bf..b61259cfce 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -120,7 +120,7 @@ function date_i18n( $dateformatstring, $unixtimestamp = false, $gmt = false ) { } $timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' ); $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' ); if ( $timezone_string ) { $timezone_object = timezone_open( $timezone_string ); @@ -4062,9 +4062,6 @@ function global_terms_enabled() { * @return float|bool */ function wp_timezone_override_offset() { - if ( !wp_timezone_supported() ) { - return false; - } if ( !$timezone_string = get_option( 'timezone_string' ) ) { return false; } @@ -4077,27 +4074,6 @@ function wp_timezone_override_offset() { 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}} *