| Index: trunk/extensions/UploadWizard/UploadWizard.php |
| — | — | @@ -62,9 +62,6 @@ |
| 63 | 63 | |
| 64 | 64 | $wgAPIModules['deleteuploadcampaign'] = 'ApiDeleteUploadCampaign'; |
| 65 | 65 | |
| 66 | | -// Disable ResourceLoader support by default, it's currently broken |
| 67 | | -// $wgUploadWizardDisableResourceLoader = true; |
| 68 | | - |
| 69 | 66 | // for ResourceLoader |
| 70 | 67 | $wgHooks['ResourceLoaderRegisterModules'][] = 'UploadWizardHooks::resourceLoaderRegisterModules'; |
| 71 | 68 | $wgHooks['CanonicalNamespaces'][] = 'UploadWizardHooks::canonicalNamespaces'; |
| Index: trunk/extensions/UploadWizard/UploadWizardHooks.php |
| — | — | @@ -425,10 +425,7 @@ |
| 426 | 426 | * Adds modules to ResourceLoader |
| 427 | 427 | */ |
| 428 | 428 | public static function resourceLoaderRegisterModules( &$resourceLoader ) { |
| 429 | | - global $wgExtensionAssetsPath, $wgUploadWizardDisableResourceLoader; |
| 430 | | - if ( $wgUploadWizardDisableResourceLoader ) { |
| 431 | | - return true; |
| 432 | | - } |
| | 429 | + global $wgExtensionAssetsPath; |
| 433 | 430 | |
| 434 | 431 | $localpath = dirname( __FILE__ ); |
| 435 | 432 | $remotepath = "$wgExtensionAssetsPath/UploadWizard"; |