Fixed error suppressing suggested in r58559 by Tim. Also fixed some warnings and...

[lhc/web/wiklou.git] / config / Installer.php

diff --git a/config/Installer.php b/config/Installer.php
index c718aff..403e7b4 100644 (file)
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -419,13 +419,6 @@ if( wfIniGetBool( "zend.ze1_compatibility_mode" ) ) {
        <?php
 }
 
-if( phpversion() === '5.3.1' ) {
-       $fatal = true;
-       ?><li class="error"><strong>Fatal: PHP 5.3.1 is not compatible with MediaWiki!</strong>
-       PHP 5.3.1 is not compatible with MediaWiki due to a <a href="http://news.php.net/php.internals/46389">bug in PHP</a>. Please use PHP 5.3.0, or PHP 5.3.2 or later.</li>
-       <?php
-}
-
 if( $fatal ) {
        dieout( "Cannot install MediaWiki." );
 }
@@ -1016,9 +1009,9 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                } elseif ( $conf->DBtype == 'oracle' ) {
                        echo "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) ."\"</li>";
                        $old_error_level = error_reporting();
-                       error_reporting($old_error_level & ~E_WARNING); //disable E_WARNING for test connect (oci returns login denied as warning)
+                       wfSuppressWarnings();
                        $wgDatabase = $dbc->newFromParams('DUMMY', $wgDBuser, $wgDBpassword, $wgDBname, 1);
-                       error_reporting($old_error_level);
+                       wfRestoreWarnings();
                        if (!$wgDatabase->isOpen()) {
                                $ok = true;
                                echo "<li>Connect failed.</li>";