* Special:ChangePassword no longer loads user javascript

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b22cc35..fd0935c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -94,6 +94,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   exceeding $wgMaxImageArea can still be embedded at original size
 * (bug 23078) "All public logs" option on Special:Log is now always the first
   item
+* Special:ChangePassword no longer loads user javascript
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent

diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php
index 8c1eee7..6f484e5 100644 (file)
--- a/includes/specials/SpecialResetpass.php
+++ b/includes/specials/SpecialResetpass.php
@@ -31,6 +31,7 @@ class SpecialResetpass extends SpecialPage {
                
                $this->setHeaders();
                $this->outputHeader();
+               $wgOut->disallowUserJs();
 
                if( !$wgAuth->allowPasswordChange() ) {
                        $this->error( wfMsg( 'resetpass_forbidden' ) );