[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: MWMultiVersion: don't add --wiki is it's already present

2018-01-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405976 )

Change subject: MWMultiVersion: don't add --wiki is it's already present
..


MWMultiVersion: don't add --wiki is it's already present

Otherwise, stuff like SiteConfiguration::getConfig() breaks

Change-Id: I5d7a257e7e7875b87b529cf8c698de73cc807be6
---
M puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git 
a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb 
b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
index f8ecf8f..9b2db18 100644
--- a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
+++ b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
@@ -186,8 +186,10 @@
global $IP;
if ( strpos( $script, "{$IP}/" ) === 0 ) {
$script = substr( $script, strlen( "{$IP}/" ) );
-   $wiki = wfWikiId();
-   array_unshift( $params, "--wiki=$wiki" );
+   if ( strpos( $params[0], '--wiki' ) !== 0 ) {
+   $wiki = wfWikiId();
+   array_unshift( $params, "--wiki=$wiki" );
+   }
$options['wrapper'] = __DIR__ . '/MWScript.php';
}
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d7a257e7e7875b87b529cf8c698de73cc807be6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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/vagrant[master]: MWMultiVersion: don't add --wiki is it's already present

2018-01-23 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405976 )

Change subject: MWMultiVersion: don't add --wiki is it's already present
..

MWMultiVersion: don't add --wiki is it's already present

Otherwise, stuff like SiteConfiguration::getConfig() breaks

Change-Id: I5d7a257e7e7875b87b529cf8c698de73cc807be6
---
M puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/76/405976/1

diff --git 
a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb 
b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
index f8ecf8f..18e9655 100644
--- a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
+++ b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
@@ -186,8 +186,10 @@
global $IP;
if ( strpos( $script, "{$IP}/" ) === 0 ) {
$script = substr( $script, strlen( "{$IP}/" ) );
-   $wiki = wfWikiId();
-   array_unshift( $params, "--wiki=$wiki" );
+   if ( strpos( $params[0], '--wiki' ) !== 0 ) {
+   $wiki = wfWikiId();
+   array_unshift( $params, "--wi_ki=$wiki" );
+   }
$options['wrapper'] = __DIR__ . '/MWScript.php';
}
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d7a257e7e7875b87b529cf8c698de73cc807be6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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