### Eclipse Workspace Patch 1.0
#P wordpress-trunk
Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php (revision 17562)
+++ wp-admin/options-general.php (working copy)
@@ -135,45 +135,7 @@
- |
-
-
-
-UTC time is %s '), date_i18n( $time_format, false, 'gmt')); ?>
-
- %2$s'), $current_offset_name, date_i18n($time_format)); ?>
-
-
-
- |
-UTC time is %s
'), date_i18n($timezone_format, false, 'gmt')); ?>
%1$s'), date_i18n($timezone_format)); ?>
-
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php (revision 17562)
+++ wp-includes/functions.php (working copy)
@@ -120,7 +120,7 @@
}
$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 );
@@ -4028,9 +4028,6 @@
* @return float|bool
*/
function wp_timezone_override_offset() {
- if ( !wp_timezone_supported() ) {
- return false;
- }
if ( !$timezone_string = get_option( 'timezone_string' ) ) {
return false;
}
@@ -4044,27 +4041,6 @@
}
/**
- * 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}}
*
* @since 2.9.0
Index: wp-includes/deprecated.php
===================================================================
--- wp-includes/deprecated.php (revision 17562)
+++ wp-includes/deprecated.php (working copy)
@@ -2602,3 +2602,17 @@
return true;
}
+/**
+ * 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;
+}
+