| Index: trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php |
| — | — | @@ -45,8 +45,7 @@ |
| 46 | 46 | * @param $subPage, e.g. the "foo" in Special:UploadWizard/foo. |
| 47 | 47 | */ |
| 48 | 48 | public function execute( $subPage ) { |
| 49 | | - global $wgRequest, $wgLang, $wgUser, $wgOut, $wgExtensionAssetsPath, |
| 50 | | - $wgUploadWizardDisableResourceLoader; |
| | 49 | + global $wgRequest, $wgLang, $wgUser, $wgOut; |
| 51 | 50 | |
| 52 | 51 | // side effects: if we can't upload, will print error page to wgOut |
| 53 | 52 | // and return false |
| — | — | @@ -76,19 +75,7 @@ |
| 77 | 76 | $this->addJsVars( $subPage ); |
| 78 | 77 | |
| 79 | 78 | // dependencies (css, js) |
| 80 | | - if ( !$wgUploadWizardDisableResourceLoader && class_exists( 'ResourceLoader' ) ) { |
| 81 | | - $wgOut->addModules( 'ext.uploadWizard' ); |
| 82 | | - } else { |
| 83 | | - $basepath = "$wgExtensionAssetsPath/UploadWizard"; |
| 84 | | - $dependencyLoader = new UploadWizardDependencyLoader( $wgLang->getCode() ); |
| 85 | | - if ( UploadWizardConfig::getSetting( 'debug', $this->campaign ) ) { |
| 86 | | - // each file as an individual script or style |
| 87 | | - $dependencyLoader->outputHtmlDebug( $wgOut, $basepath ); |
| 88 | | - } else { |
| 89 | | - // combined & minified |
| 90 | | - $dependencyLoader->outputHtml( $wgOut, $basepath ); |
| 91 | | - } |
| 92 | | - } |
| | 79 | + $wgOut->addModules( 'ext.uploadWizard' ); |
| 93 | 80 | |
| 94 | 81 | // where the uploadwizard will go |
| 95 | 82 | // TODO import more from UploadWizard's createInterface call. |