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
Give grep a chance to find the usages
[lhc/web/wiklou.git]
/
includes
/
installer
/
CliInstaller.php
diff --git
a/includes/installer/CliInstaller.php
b/includes/installer/CliInstaller.php
index
28b34a8
..
d4e19f6
100644
(file)
--- a/
includes/installer/CliInstaller.php
+++ b/
includes/installer/CliInstaller.php
@@
-114,7
+114,7
@@
class CliInstaller extends Installer {
*/
public function execute() {
$vars = Installer::getExistingLocalSettings();
*/
public function execute() {
$vars = Installer::getExistingLocalSettings();
- if( $vars ) {
+ if
( $vars ) {
$this->showStatusMessage(
Status::newFatal( "config-localsettings-cli-upgrade" )
);
$this->showStatusMessage(
Status::newFatal( "config-localsettings-cli-upgrade" )
);
@@
-129,7
+129,7
@@
class CliInstaller extends Installer {
/**
* Write LocalSettings.php to a given path
*
/**
* Write LocalSettings.php to a given path
*
- * @param
$path String
Full path to write LocalSettings.php to
+ * @param
string $path
Full path to write LocalSettings.php to
*/
public function writeConfigurationFile( $path ) {
$ls = InstallerOverrides::getLocalSettingsGenerator( $this );
*/
public function writeConfigurationFile( $path ) {
$ls = InstallerOverrides::getLocalSettingsGenerator( $this );
@@
-137,6
+137,9
@@
class CliInstaller extends Installer {
}
public function startStage( $step ) {
}
public function startStage( $step ) {
+ // Give grep a chance to find the usages: config-install-database, config-install-tables,
+ // config-install-interwiki, config-install-stats, config-install-keys, config-install-sysop,
+ // config-install-mainpage
$this->showMessage( "config-install-$step" );
}
$this->showMessage( "config-install-$step" );
}
@@
-163,7
+166,7
@@
class CliInstaller extends Installer {
protected function getMessageText( $params ) {
$msg = array_shift( $params );
protected function getMessageText( $params ) {
$msg = array_shift( $params );
- $text = wfM
sgExt( $msg, array( 'parseinline' ), $params
);
+ $text = wfM
essage( $msg, $params )->parse(
);
$text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 <$1>', $text );
return html_entity_decode( strip_tags( $text ), ENT_QUOTES );
$text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 <$1>', $text );
return html_entity_decode( strip_tags( $text ), ENT_QUOTES );
@@
-191,9
+194,9
@@
class CliInstaller extends Installer {
}
}
}
}
- public function envCheckPath(
) {
+ public function envCheckPath() {
if ( !$this->specifiedScriptPath ) {
if ( !$this->specifiedScriptPath ) {
- $this->showMessage( 'config-no-cli-uri', $this->getVar(
"wgScriptPath"
) );
+ $this->showMessage( 'config-no-cli-uri', $this->getVar(
"wgScriptPath"
) );
}
return parent::envCheckPath();
}
}
return parent::envCheckPath();
}