http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89873
Revision: 89873
Author: ialex
Date: 2011-06-11 08:03:59 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
Removed usage of error suppression operator, also removed function_exists()
check for timezone_open() since we now require PHP 5.2.3
Modified Paths:
--------------
trunk/phase3/languages/Language.php
Modified: trunk/phase3/languages/Language.php
===================================================================
--- trunk/phase3/languages/Language.php 2011-06-11 07:43:40 UTC (rev 89872)
+++ trunk/phase3/languages/Language.php 2011-06-11 08:03:59 UTC (rev 89873)
@@ -759,9 +759,12 @@
$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;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
