https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113683
Revision: 113683
Author: brion
Date: 2012-03-12 23:11:23 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
Drop check for commented-out wgUploadWizardDisableResourceLoader var, UW no
longer works without RL
Modified Paths:
--------------
trunk/extensions/UploadWizard/UploadWizard.php
trunk/extensions/UploadWizard/UploadWizardHooks.php
Modified: trunk/extensions/UploadWizard/UploadWizard.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.php 2012-03-12 23:08:57 UTC
(rev 113682)
+++ trunk/extensions/UploadWizard/UploadWizard.php 2012-03-12 23:11:23 UTC
(rev 113683)
@@ -62,9 +62,6 @@
$wgAPIModules['deleteuploadcampaign'] = 'ApiDeleteUploadCampaign';
-// Disable ResourceLoader support by default, it's currently broken
-// $wgUploadWizardDisableResourceLoader = true;
-
// for ResourceLoader
$wgHooks['ResourceLoaderRegisterModules'][] =
'UploadWizardHooks::resourceLoaderRegisterModules';
$wgHooks['CanonicalNamespaces'][] = 'UploadWizardHooks::canonicalNamespaces';
Modified: trunk/extensions/UploadWizard/UploadWizardHooks.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizardHooks.php 2012-03-12 23:08:57 UTC
(rev 113682)
+++ trunk/extensions/UploadWizard/UploadWizardHooks.php 2012-03-12 23:11:23 UTC
(rev 113683)
@@ -425,10 +425,7 @@
* Adds modules to ResourceLoader
*/
public static function resourceLoaderRegisterModules( &$resourceLoader
) {
- global $wgExtensionAssetsPath,
$wgUploadWizardDisableResourceLoader;
- if ( $wgUploadWizardDisableResourceLoader ) {
- return true;
- }
+ global $wgExtensionAssetsPath;
$localpath = dirname( __FILE__ );
$remotepath = "$wgExtensionAssetsPath/UploadWizard";
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
