jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351567 )
Change subject: Fix multi-wiki support for onWfShellMaintenanceCmd
......................................................................
Fix multi-wiki support for onWfShellMaintenanceCmd
Add --wiki=$wiki to make sure the wiki is given and the first
positional argument isn't misinterpreted as the wiki.
Also, fix spacing in this function.
Change-Id: I3b6de316f6db1011aac4c9068dd8daa435028852
---
M puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
1 file changed, 8 insertions(+), 6 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 6b3983c..f8ecf8f 100644
--- a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
+++ b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
@@ -183,12 +183,14 @@
* @return boolean
*/
public static function onWfShellMaintenanceCmd( &$script, array
&$params, array &$options ) {
- global $IP;
- if ( strpos( $script, "{$IP}/" ) === 0 ) {
- $script = substr( $script, strlen( "{$IP}/" ) );
- $options['wrapper'] = __DIR__ . '/MWScript.php';
- }
- return true;
+ global $IP;
+ if ( strpos( $script, "{$IP}/" ) === 0 ) {
+ $script = substr( $script, strlen( "{$IP}/" ) );
+ $wiki = wfWikiId();
+ array_unshift( $params, "--wiki=$wiki" );
+ $options['wrapper'] = __DIR__ . '/MWScript.php';
+ }
+ return true;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/351567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b6de316f6db1011aac4c9068dd8daa435028852
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
