X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=maintenance%2Finstall.php;h=ae3074a4c8b0399775f13f1e87c81e0f11406e8d;hb=3aa7e1d66a0f3d91043c7abf0e10eac15f445a80;hp=b948b67494d4c202c14a8c9550b06a997843f31f;hpb=abb5869cba1cca1c7d9bedfda6d3831bf2fc11a0;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/install.php b/maintenance/install.php index b948b67494..ae3074a4c8 100644 --- a/maintenance/install.php +++ b/maintenance/install.php @@ -23,7 +23,9 @@ // Checking for old versions of PHP is done in Maintenance.php // We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+ +// @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound require_once dirname( __FILE__ ) . '/Maintenance.php'; +// @codingStandardsIgnoreEnd define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' ); define( 'MEDIAWIKI_INSTALL', true ); @@ -43,7 +45,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 +106,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 +121,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 ); }