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 "Switch the sidebar cache to using checkKeys"
[lhc/web/wiklou.git]
/
maintenance
/
install.php
diff --git
a/maintenance/install.php
b/maintenance/install.php
index
cac3009
..
6249094
100644
(file)
--- 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".' );
}
$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
$dbpass = file_get_contents( $dbpassfile ); // returns false on failure
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $dbpass === false ) {
if ( $dbpass === false ) {
- $this->
error( "Couldn't open $dbpassfile", true
);
+ $this->
fatalError( "Couldn't open $dbpassfile"
);
}
$this->mOptions['dbpass'] = trim( $dbpass, "\r\n" );
}
}
$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".' );
}
$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
$pass = file_get_contents( $passfile ); // returns false on failure
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $pass === false ) {
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->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;
require_once RUN_MAINTENANCE_IF_MAIN;