Merge "objectcache: Allow bounded HashBagOStuff sizes and limit it in WANObjectCache"

[lhc/web/wiklou.git] / maintenance / install.php

diff --git a/maintenance/install.php b/maintenance/install.php
index b948b67..212e42a 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -43,7 +43,7 @@ class CommandLineInstaller extends Maintenance {
                global $IP;
 
                $this->addDescription( "CLI-based MediaWiki installation and configuration.\n" .
-                       "Defaut options are indicated in parenthesis." );
+                       "Default options are indicated in parentheses." );
 
                $this->addArg( 'name', 'The name of the wiki (MediaWiki)', false );
 
@@ -104,9 +104,9 @@ class CommandLineInstaller extends Maintenance {
                                $this->error( 'WARNING: You have provided the options "dbpass" and "dbpassfile". '
                                        . 'The content of "dbpassfile" overrides "dbpass".' );
                        }
-                       wfSuppressWarnings();
+                       MediaWiki\suppressWarnings();
                        $dbpass = file_get_contents( $dbpassfile ); // returns false on failure
-                       wfRestoreWarnings();
+                       MediaWiki\restoreWarnings();
                        if ( $dbpass === false ) {
                                $this->error( "Couldn't open $dbpassfile", true );
                        }
@@ -119,9 +119,9 @@ class CommandLineInstaller extends Maintenance {
                                $this->error( 'WARNING: You have provided the options "pass" and "passfile". '
                                        . 'The content of "passfile" overrides "pass".' );
                        }
-                       wfSuppressWarnings();
+                       MediaWiki\suppressWarnings();
                        $pass = file_get_contents( $passfile ); // returns false on failure
-                       wfRestoreWarnings();
+                       MediaWiki\restoreWarnings();
                        if ( $pass === false ) {
                                $this->error( "Couldn't open $passfile", true );
                        }