*Use wfSuppressWarnings() instead of error_reporting()

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index d072451..75e4ef9 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -158,9 +158,9 @@ class OutputPage {
                        # this breaks strtotime().
                        $modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
                        
-                       $oe_level = error_reporting(E_ALL); //grrrr
+                       wfSuppressWarnings(); // E_STRICT system time bitching
                        $modsinceTime = strtotime( $modsince );
-                       error_reporting($oe_level); //grrrr
+                       wfRestoreWarnings();
                        
                        $ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 );
                        wfDebug( "$fname: -- client send If-Modified-Since: " . $modsince . "\n", false );

diff --git a/includes/Parser.php b/includes/Parser.php
index bc73b57..4f4fdf0 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2416,8 +2416,8 @@ class Parser
                        $oldtz = getenv( 'TZ' );
                        putenv( 'TZ='.$wgLocaltimezone );
                }
-               $oe_level = error_reporting(E_ALL); #grrrr
                
+               wfSuppressWarnings(); // E_STRICT system time bitching
                $localTimestamp = date( 'YmdHis', $ts );
                $localMonth = date( 'm', $ts );
                $localMonthName = date( 'n', $ts );
@@ -2430,8 +2430,7 @@ class Parser
                if ( isset( $wgLocaltimezone ) ) {
                        putenv( 'TZ='.$oldtz );
                }
-               
-               error_reporting($oe_level); #grrrr
+               wfRestoreWarnings();
 
                switch ( $index ) {
                        case 'currentmonth':

diff --git a/languages/Language.php b/languages/Language.php
index 0352f73..e635baf 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -438,7 +438,7 @@ class Language {
                # No difference ? Return time unchanged
                if ( 0 == $hrDiff && 0 == $minDiff ) { return $ts; }
 
-               $eo_level = error_reporting(E_ALL); //grrr, no system date bitching
+               wfSuppressWarnings(); // E_STRICT system time bitching
                # Generate an adjusted date
                $t = mktime( (
                  (int)substr( $ts, 8, 2) ) + $hrDiff, # Hours
@@ -449,7 +449,7 @@ class Language {
                  (int)substr( $ts, 0, 4 ) ); #Year
                
                $date = date( 'YmdHis', $t );
-               error_reporting($eo_level); //grrr
+               wfRestoreWarnings();
                
                return $date;
        }