From d03f5073caf4ddec7b9ce8a71513fc401a63ba4b Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 11 Jun 2011 08:03:59 +0000 Subject: [PATCH] Removed usage of error suppression operator, also removed function_exists() check for timezone_open() since we now require PHP 5.2.3 --- languages/Language.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index 591bb3943a..cc0062b0ff 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -759,9 +759,12 @@ class Language { $data = explode( '|', $tz, 3 ); if ( $data[0] == 'ZoneInfo' ) { - if ( function_exists( 'timezone_open' ) && @timezone_open( $data[2] ) !== false ) { + wfSuppressWarnings(); + $userTZ = timezone_open( $data[2] ); + wfRestoreWarnings(); + if ( $userTZ !== false ) { $date = date_create( $ts, timezone_open( 'UTC' ) ); - date_timezone_set( $date, timezone_open( $data[2] ) ); + date_timezone_set( $date, $userTZ ); $date = date_format( $date, 'YmdHis' ); return $date; } -- 2.20.1