From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Fri, 3 Jul 2009 14:03:45 +0000 (+0000)
Subject: Move addition of prefs.js down, to avoid errors when you can't view the form as in... 
X-Git-Tag: 1.31.0-rc.0~41118
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=11706a9aa3228e970eb2c1cd459d8a11216f766b;p=lhc%2Fweb%2Fwiklou.git

Move addition of prefs.js down, to avoid errors when you can't view the form as in bug 19307
---

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index 51ef9c569f..adcaead223 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -10,9 +10,6 @@ class SpecialPreferences extends SpecialPage {
 
 		$this->setHeaders();
 		$this->outputHeader();
-
-		$wgOut->addScriptFile( 'prefs.js' );
-
 		$wgOut->disallowUserJs();  # Prevent hijacked user scripts from sniffing passwords etc.
 
 		if ( $wgUser->isAnon() ) {
@@ -28,6 +25,8 @@ class SpecialPreferences extends SpecialPage {
 			$this->showResetForm();
 			return;
 		}
+		
+		$wgOut->addScriptFile( 'prefs.js' );
 
 		if ( $wgRequest->getCheck( 'success' ) ) {
 			$wgOut->wrapWikiMsg(