| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js |
| — | — | @@ -519,9 +519,7 @@ |
| 520 | 520 | * Depending on whether we split uploading / detailing, it may actually always be as simple as loading a URL |
| 521 | 521 | */ |
| 522 | 522 | reset: function() { |
| 523 | | - // Get number of times we've reloaded UploadWizard (for Firefox 3 bug - 27424) |
| 524 | | - var reloadNumber = parseInt(UploadWizardReload) + 1; |
| 525 | | - window.location = wgArticlePath.replace( '$1', 'Special:UploadWizard?reload='+reloadNumber ); |
| | 523 | + window.location = wgArticlePath.replace( '$1', 'Special:UploadWizard' ); |
| 526 | 524 | }, |
| 527 | 525 | |
| 528 | 526 | |
| Index: trunk/extensions/UploadWizard/SpecialUploadWizard.php |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | * @param $subPage, e.g. the "foo" in Special:UploadWizard/foo. |
| 39 | 39 | */ |
| 40 | 40 | public function execute( $subPage ) { |
| 41 | | - global $wgRequest, $wgLang, $wgUser, $wgOut, $wgExtensionAssetsPath, |
| | 41 | + global $wgLang, $wgUser, $wgOut, $wgExtensionAssetsPath, |
| 42 | 42 | $wgUploadWizardDisableResourceLoader; |
| 43 | 43 | |
| 44 | 44 | // side effects: if we can't upload, will print error page to wgOut |
| — | — | @@ -48,9 +48,6 @@ |
| 49 | 49 | |
| 50 | 50 | $this->setHeaders(); |
| 51 | 51 | $this->outputHeader(); |
| 52 | | - |
| 53 | | - // Get number of times we've reloaded UploadWizard (for Firefox 3 bug - 27424) |
| 54 | | - $reload = $wgRequest->getText( 'reload', '0' ); |
| 55 | 52 | |
| 56 | 53 | // fallback for non-JS |
| 57 | 54 | $wgOut->addHTML( '<noscript>' ); |
| — | — | @@ -60,7 +57,7 @@ |
| 61 | 58 | |
| 62 | 59 | |
| 63 | 60 | // global javascript variables |
| 64 | | - $this->addJsVars( $subPage, $reload ); |
| | 61 | + $this->addJsVars( $subPage ); |
| 65 | 62 | |
| 66 | 63 | // dependencies (css, js) |
| 67 | 64 | if ( !$wgUploadWizardDisableResourceLoader && class_exists( 'ResourceLoader' ) ) { |
| — | — | @@ -92,7 +89,7 @@ |
| 93 | 90 | * |
| 94 | 91 | * @param subpage, e.g. the "foo" in Special:UploadWizard/foo |
| 95 | 92 | */ |
| 96 | | - public function addJsVars( $subPage, $reload ) { |
| | 93 | + public function addJsVars( $subPage ) { |
| 97 | 94 | global $wgOut, $wgUpwizDir, $wgUploadWizardConfig, $wgSitename; |
| 98 | 95 | |
| 99 | 96 | // Merge the default configuration with the local settings $wgUploadWizardConfig configuration |
| — | — | @@ -109,9 +106,6 @@ |
| 110 | 107 | // Site name is a true global not specific to Upload Wizard |
| 111 | 108 | array( |
| 112 | 109 | 'wgSiteName' => $wgSitename |
| 113 | | - ) + |
| 114 | | - array( |
| 115 | | - 'UploadWizardReload' => $reload |
| 116 | 110 | ) |
| 117 | 111 | ) |
| 118 | 112 | ); |