Seb35 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299371
Change subject: Remove oddities with (wiki-)config files: now only one list of
(wiki-)config files
......................................................................
Remove oddities with (wiki-)config files: now only one list of (wiki-)config
files
---
M src/MediaWikiFarm.php
1 file changed, 3 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm
refs/changes/71/299371/1
diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index d95e7f9..a6ac74a 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -210,15 +210,11 @@
$this->setWikiProperty( 'data', false );
$this->setWikiProperty( 'cache', false );
$this->setWikiProperty( 'config', true );
- $this->setWikiProperty( 'post-config', true );
$this->setWikiProperty( 'exec-config', true );
foreach( $this->wiki['variables'] as &$variable ) {
$this->setWikiPropertyValue( $variable['file'], false );
- $this->setWikiPropertyValue( $variable['config'], true
);
- $this->setWikiPropertyValue( $variable['post-config'],
true );
- $this->setWikiPropertyValue( $variable['exec-config'],
true );
}
return true;
@@ -497,7 +493,7 @@
if( $toArray ) $value = array( $value );
else $value = preg_replace( $rkeys, $rvalues, $value );
}
- else {
+ else if( !is_array( $value ) ) {
$this->unusable = true;
return;
@@ -559,8 +555,8 @@
$codeDir = $this->wiki['code'];
$cacheFile = $this->wiki['cache'];
$generalYamlFilename = '/'.$this->wiki['config'][0];
- $suffixedYamlFilename =
'/'.$this->wiki['variables'][0]['config'][0];
- $privateYamlFilename = '/'.$this->wiki['post-config'][0];
+ $suffixedYamlFilename = '/'.$this->wiki['config'][1];
+ $privateYamlFilename = '/'.$this->wiki['config'][2];
//var_dump($wgConf);
//var_dump($codeDir);
--
To view, visit https://gerrit.wikimedia.org/r/299371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9343b16dc845a5a7fe072b568a23769a7c524197
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 <seb35wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
