Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 4 insertions, 4 deletions

diff --git a/maintenance/install.php b/maintenance/install.php
index b948b674..0037ea80 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -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 );
 			}