X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Finstall.php;h=624909452af9caa58743677d915fc66d823a5b37;hb=0bf48b72331598fa464886f2bc9ca8259c610175;hp=cac3009a8f49faf37f997f4e25e9424b6af394b1;hpb=598a250b71aee0ca14eb8661b139bb23cf8e5f40;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/install.php b/maintenance/install.php index cac3009a8f..624909452a 100644 --- a/maintenance/install.php +++ b/maintenance/install.php @@ -132,11 +132,11 @@ class CommandLineInstaller extends Maintenance { $this->error( 'WARNING: You have provided the options "dbpass" and "dbpassfile". ' . 'The content of "dbpassfile" overrides "dbpass".' ); } - MediaWiki\suppressWarnings(); + Wikimedia\suppressWarnings(); $dbpass = file_get_contents( $dbpassfile ); // returns false on failure - MediaWiki\restoreWarnings(); + Wikimedia\restoreWarnings(); if ( $dbpass === false ) { - $this->error( "Couldn't open $dbpassfile", true ); + $this->fatalError( "Couldn't open $dbpassfile" ); } $this->mOptions['dbpass'] = trim( $dbpass, "\r\n" ); } @@ -149,15 +149,15 @@ class CommandLineInstaller extends Maintenance { $this->error( 'WARNING: You have provided the options "pass" and "passfile". ' . 'The content of "passfile" overrides "pass".' ); } - MediaWiki\suppressWarnings(); + Wikimedia\suppressWarnings(); $pass = file_get_contents( $passfile ); // returns false on failure - MediaWiki\restoreWarnings(); + Wikimedia\restoreWarnings(); if ( $pass === false ) { - $this->error( "Couldn't open $passfile", true ); + $this->fatalError( "Couldn't open $passfile" ); } $this->mOptions['pass'] = trim( $pass, "\r\n" ); } elseif ( $this->getOption( 'pass' ) === null ) { - $this->error( 'You need to provide the option "pass" or "passfile"', true ); + $this->fatalError( 'You need to provide the option "pass" or "passfile"' ); } } @@ -168,6 +168,6 @@ class CommandLineInstaller extends Maintenance { } } -$maintClass = 'CommandLineInstaller'; +$maintClass = CommandLineInstaller::class; require_once RUN_MAINTENANCE_IF_MAIN;