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
Save value from CLI installers `--lang` argument
[lhc/web/wiklou.git]
/
includes
/
installer
/
CliInstaller.php
diff --git
a/includes/installer/CliInstaller.php
b/includes/installer/CliInstaller.php
index
32d2634
..
162a978
100644
(file)
--- a/
includes/installer/CliInstaller.php
+++ b/
includes/installer/CliInstaller.php
@@
-38,7
+38,6
@@
class CliInstaller extends Installer {
'dbpass' => 'wgDBpassword',
'dbprefix' => 'wgDBprefix',
'dbtableoptions' => 'wgDBTableOptions',
'dbpass' => 'wgDBpassword',
'dbprefix' => 'wgDBprefix',
'dbtableoptions' => 'wgDBTableOptions',
- 'dbmysql5' => 'wgDBmysql5',
'dbport' => 'wgDBport',
'dbschema' => 'wgDBmwschema',
'dbpath' => 'wgSQLiteDataDir',
'dbport' => 'wgDBport',
'dbschema' => 'wgDBmwschema',
'dbpath' => 'wgSQLiteDataDir',
@@
-73,6
+72,7
@@
class CliInstaller extends Installer {
$wgContLang = Language::factory( $option['lang'] );
$wgLang = Language::factory( $option['lang'] );
$wgLanguageCode = $option['lang'];
$wgContLang = Language::factory( $option['lang'] );
$wgLang = Language::factory( $option['lang'] );
$wgLanguageCode = $option['lang'];
+ $this->setVar( 'wgLanguageCode', $wgLanguageCode );
RequestContext::getMain()->setLanguage( $wgLang );
}
RequestContext::getMain()->setLanguage( $wgLang );
}
@@
-107,6
+107,11
@@
class CliInstaller extends Installer {
$this->setVar( '_AdminPassword', $option['pass'] );
}
$this->setVar( '_AdminPassword', $option['pass'] );
}
+ // Detect and inject any extension found
+ if ( isset( $option['with-extensions'] ) ) {
+ $this->setVar( '_Extensions', array_keys( $this->findExtensions() ) );
+ }
+
// Set up the default skins
$skins = array_keys( $this->findExtensions( 'skins' ) );
$this->setVar( '_Skins', $skins );
// Set up the default skins
$skins = array_keys( $this->findExtensions( 'skins' ) );
$this->setVar( '_Skins', $skins );