Felipe Schenone has submitted this change and it was merged.
Change subject: Doin't hard code the extension path instead use the current DIR
......................................................................
Doin't hard code the extension path instead use the current DIR
Change-Id: I9212ccc3148179c20e346c02d9bae9476e5bb65f
---
M MsUpload.body.php
M MsUpload.js
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Felipe Schenone: Verified; Looks good to me, approved
diff --git a/MsUpload.body.php b/MsUpload.body.php
index 7643257..9473cd2 100644
--- a/MsUpload.body.php
+++ b/MsUpload.body.php
@@ -4,7 +4,11 @@
static function start() {
global $wgOut, $wgScriptPath, $wgMSU_useMsLinks,
$wgMSU_showAutoCat, $wgMSU_checkAutoCat,
- $wgMSU_confirmReplace, $wgMSU_useDragDrop,
$wgMSU_imgParams, $wgFileExtensions;
+ $wgMSU_confirmReplace, $wgMSU_useDragDrop,
$wgMSU_imgParams, $wgFileExtensions,
+ $wgMSU_flash_swf_url, $wgMSU_silverlight_xap_url;
+
+ $wgMSU_flash_swf_url = __DIR__ . '/plupload/Moxie.swf';
+ $wgMSU_silverlight_xap_url = __DIR__ . '/plupload/Moxie.xap';
$wgOut->addJsConfigVars( array(
'wgFileExtensions' => array_values( array_unique(
$wgFileExtensions ) ),
@@ -16,6 +20,8 @@
$msuVars = array(
'scriptPath' => $wgScriptPath,
+ 'flash_swf_url' => $wgMSU_flash_swf_url,
+ 'silverlight_xap_url' => $wgMSU_silverlight_xap_url,
'useDragDrop' => $wgMSU_useDragDrop,
'showAutoCat' => $wgMSU_showAutoCat,
'checkAutoCat' => $wgMSU_checkAutoCat,
diff --git a/MsUpload.js b/MsUpload.js
index 46fd1cb..3855d47 100755
--- a/MsUpload.js
+++ b/MsUpload.js
@@ -270,8 +270,8 @@
max_file_size: '100mb',
drop_element: 'msupload-dropzone',
url: msuVars.scriptPath + '/api.php',
- flash_swf_url: msuVars.scriptPath +
'/extensions/MsUpload/plupload/Moxie.swf',
- silverlight_xap_url: msuVars.path +
'/extensions/MsUpload/plupload/Moxie.xap'
+ flash_swf_url: msuVars.flash_swf_url,
+ silverlight_xap_url: msuVars.silverlight_xap_url
} );
// Bind events
--
To view, visit https://gerrit.wikimedia.org/r/270582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9212ccc3148179c20e346c02d9bae9476e5bb65f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Felipe Schenone <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
