dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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" .
global $IP;
$this->addDescription( "CLI-based MediaWiki installation and configuration.\n" .
- "Defau
t options are indicated in parenthesi
s." );
+ "Defau
lt options are indicated in parenthese
s." );
$this->addArg( 'name', 'The name of the wiki (MediaWiki)', false );
$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".' );
}
$this->error( 'WARNING: You have provided the options "dbpass" and "dbpassfile". '
. 'The content of "dbpassfile" overrides "dbpass".' );
}
-
wfS
uppressWarnings();
+
MediaWiki\s
uppressWarnings();
$dbpass = file_get_contents( $dbpassfile ); // returns false on failure
$dbpass = file_get_contents( $dbpassfile ); // returns false on failure
-
wfR
estoreWarnings();
+
MediaWiki\r
estoreWarnings();
if ( $dbpass === false ) {
$this->error( "Couldn't open $dbpassfile", true );
}
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".' );
}
$this->error( 'WARNING: You have provided the options "pass" and "passfile". '
. 'The content of "passfile" overrides "pass".' );
}
-
wfS
uppressWarnings();
+
MediaWiki\s
uppressWarnings();
$pass = file_get_contents( $passfile ); // returns false on failure
$pass = file_get_contents( $passfile ); // returns false on failure
-
wfR
estoreWarnings();
+
MediaWiki\r
estoreWarnings();
if ( $pass === false ) {
$this->error( "Couldn't open $passfile", true );
}
if ( $pass === false ) {
$this->error( "Couldn't open $passfile", true );
}