jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350125 )
Change subject: Turn $wg3dProcessor into an array of arguments
......................................................................
Turn $wg3dProcessor into an array of arguments
This got escaped as 1 very long argument, but it's actually
several distinct arguments which all need to be escaped
separately.
Change-Id: I3d47220cc3a273db1f5962d58a4636b0f4db3cdd
---
M wmf-config/CommonSettings-labs.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aude: Verified; Looks good to me, approved
MarkTraceur: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 107c736..6bb42af 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -371,7 +371,7 @@
// Add 3d media viewer extension
$wgMediaViewerExtensions['stl'] = 'mmv.3d';
- $wg3dProcessor = '/usr/bin/xvfb-run -a -s "-ac -screen 0 1280x1024x24"
/srv/deployment/3d2png/deploy/src/3d2png.js';
+ $wg3dProcessor = ['/usr/bin/xvfb-run', '-a', '-s', '-ac -screen 0
1280x1024x24' ,'/srv/deployment/3d2png/deploy/src/3d2png.js'];
}
--
To view, visit https://gerrit.wikimedia.org/r/350125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d47220cc3a273db1f5962d58a4636b0f4db3cdd
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
