[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug in the previous commit in multiversion mode

2016-12-27 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329225 )

Change subject: Bug in the previous commit in multiversion mode
..


Bug in the previous commit in multiversion mode

Bugs:
* When running farm in multiversion mode, the wfLoadExtension
  for MediaWikiFarm (only) was not pointing to the right
  directory path (standard instead of dedicated).

Change-Id: I2df646dd0fa7d2ad75ccc5ee008af2a9506a86bd
---
M src/MediaWikiFarm.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Seb35: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 7c544b5..c243c78 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -1297,7 +1297,7 @@
foreach( $configuration['extensions'] as $extension ) {
if( $extension[2] == 'require_once' ) {
$extensions[$extension[1]]['require_once'] .= 
"require_once \"\$IP/{$extension[1]}s/{$extension[0]}/{$extension[0]}.php\";\n";
-   } elseif( $extension == array( 'MediaWikiFarm', 
'extension', 'wfLoadExtension' ) && $this->codeDir ) {
+   } elseif( $extension[0] == 'MediaWikiFarm' && 
$extension[1] == 'extension' && $extension[2] == 'wfLoadExtension' && 
$this->codeDir ) {
$extensions['extension']['wfLoadExtension'] .= 
"wfLoadExtension( 'MediaWikiFarm', " . var_export( $this->farmDir . 
'/extension.json', true ) . " );\n";
} elseif( $extension[2] == 'wfLoad' . ucfirst( 
$extension[1] ) ) {
$extensions[$extension[1]]['wfLoad' . ucfirst( 
$extension[1] )] .= 'wfLoad' . ucfirst( $extension[1] ) . '( ' . var_export( 
$extension[0], true ) . " );\n";

-- 
To view, visit https://gerrit.wikimedia.org/r/329225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2df646dd0fa7d2ad75ccc5ee008af2a9506a86bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Seb35 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug in the previous commit in multiversion mode

2016-12-26 Thread Seb35 (Code Review) 
Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329225 )

Change subject: Bug in the previous commit in multiversion mode
..

Bug in the previous commit in multiversion mode

Bugs:
* When running farm in multiversion mode, the wfLoadExtension
  for MediaWikiFarm (only) was not pointing to the right
  directory path (standard instead of dedicated).

Change-Id: I2df646dd0fa7d2ad75ccc5ee008af2a9506a86bd
---
M src/MediaWikiFarm.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/25/329225/1

diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 7c544b5..c243c78 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -1297,7 +1297,7 @@
foreach( $configuration['extensions'] as $extension ) {
if( $extension[2] == 'require_once' ) {
$extensions[$extension[1]]['require_once'] .= 
"require_once \"\$IP/{$extension[1]}s/{$extension[0]}/{$extension[0]}.php\";\n";
-   } elseif( $extension == array( 'MediaWikiFarm', 
'extension', 'wfLoadExtension' ) && $this->codeDir ) {
+   } elseif( $extension[0] == 'MediaWikiFarm' && 
$extension[1] == 'extension' && $extension[2] == 'wfLoadExtension' && 
$this->codeDir ) {
$extensions['extension']['wfLoadExtension'] .= 
"wfLoadExtension( 'MediaWikiFarm', " . var_export( $this->farmDir . 
'/extension.json', true ) . " );\n";
} elseif( $extension[2] == 'wfLoad' . ucfirst( 
$extension[1] ) ) {
$extensions[$extension[1]]['wfLoad' . ucfirst( 
$extension[1] )] .= 'wfLoad' . ucfirst( $extension[1] ) . '( ' . var_export( 
$extension[0], true ) . " );\n";

-- 
To view, visit https://gerrit.wikimedia.org/r/329225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2df646dd0fa7d2ad75ccc5ee008af2a9506a86bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits