Felipe Schenone has submitted this change and it was merged. Change subject: Remove php entry point ......................................................................
Remove php entry point Change-Id: I052b1e8881802a27548ec517e5adb7dd6bd92c5c (cherry picked from commit 7fb7b2c77ac214295515b5d2b7b917696f5be201) --- M MsUpload.php M extension.json 2 files changed, 17 insertions(+), 57 deletions(-) Approvals: Felipe Schenone: Looks good to me, approved jenkins-bot: Verified diff --git a/MsUpload.php b/MsUpload.php index 068d45c..12b03cc 100644 --- a/MsUpload.php +++ b/MsUpload.php @@ -1,54 +1,15 @@ <?php -$wgExtensionCredits['parserhook'][] = array( - 'name' => 'MsUpload', - 'url' => 'http://www.mediawiki.org/wiki/Extension:MsUpload', - 'version' => '12.0', - 'descriptionmsg' => 'msu-desc', - 'license-name' => 'GPL-2.0+', - 'author' => array( '[mailto:[email protected] Martin Schwindl]', '[mailto:[email protected] Martin Keyler]', '[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe Schenone]' ), -); - -$wgResourceModules['ext.MsUpload'] = array( - 'scripts' => array( - 'plupload/plupload.full.min.js', - 'MsUpload.js' - ), - 'dependencies' => 'jquery.ui.progressbar', - 'styles' => 'MsUpload.css', - 'messages' => array( - 'msu-button-title', - 'msu-insert-link', - 'msu-insert-gallery', - 'msu-insert-files', - 'msu-insert-links', - 'msu-insert-image', - 'msu-insert-video', - 'msu-cancel-upload', - 'msu-replace-file', - 'msu-clean-all', - 'msu-ext-not-allowed', - 'msu-upload-this', - 'msu-upload-all', - 'msu-dropzone', - 'msu-comment', - ), - 'localBasePath' => __DIR__, - 'remoteExtPath' => 'MsUpload', -); - -$wgMessagesDirs['MsUpload'] = __DIR__ . '/i18n'; - -$wgAutoloadClasses['MsUpload'] = __DIR__ . '/MsUpload.body.php'; - -$wgHooks['EditPage::showEditForm:initial'][] = 'MsUpload::start'; - -$wgAjaxExportList[] = 'MsUpload::saveCat'; - -// Default configuration -$wgMSU_useDragDrop = true; -$wgMSU_showAutoCat = true; -$wgMSU_checkAutoCat = true; -$wgMSU_useMsLinks = false; -$wgMSU_confirmReplace = true; -$wgMSU_imgParams = '400px'; \ No newline at end of file +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'MsUpload' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['MsUpload'] = __DIR__ . '/i18n'; + /* wfWarn( + 'Deprecated PHP entry point used for MsUpload extension. ' . + 'Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); */ + return; +} else { + die( 'This version of the MsUpload extension requires MediaWiki 1.25+' ); +} diff --git a/extension.json b/extension.json index a5f5be5..3c56e68 100644 --- a/extension.json +++ b/extension.json @@ -6,7 +6,7 @@ "[mailto:[email protected] Martin Keyler]", "[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe Schenone]" ], - "url": "http://www.mediawiki.org/wiki/Extension:MsUpload";, + "url": "https://www.mediawiki.org/wiki/Extension:MsUpload";, "descriptionmsg": "msu-desc", "license-name": "GPL-2.0+", "type": "parserhook", @@ -27,7 +27,6 @@ "dependencies": "jquery.ui.progressbar", "styles": "MsUpload.css", "messages": [ - "msu-description", "msu-button-title", "msu-insert-link", "msu-insert-gallery", @@ -55,10 +54,10 @@ "MsUpload::start" ] }, + "AjaxExportList": [ + "MsUpload::saveCat" + ], "config": { - "AjaxExportList": [ - "MsUpload::saveCat" - ], "MSU_useDragDrop": true, "MSU_showAutoCat": true, "MSU_checkAutoCat": true, -- To view, visit https://gerrit.wikimedia.org/r/305856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I052b1e8881802a27548ec517e5adb7dd6bd92c5c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MsUpload Gerrit-Branch: REL1_27 Gerrit-Owner: Paladox <[email protected]> Gerrit-Reviewer: Felipe Schenone <[email protected]> Gerrit-Reviewer: JanZerebecki <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
