https://www.mediawiki.org/wiki/Special:Code/MediaWiki/101260

Revision: 101260
Author:   ialex
Date:     2011-10-29 13:21:22 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
* (bug 19186) Special:UserLogin's title on Special:SpecialPages now says 
"create account" when the user cannot create an account
* Also added a missing call to setHeaders()

Modified Paths:
--------------
    trunk/phase3/RELEASE-NOTES-1.19
    trunk/phase3/includes/specials/SpecialUserlogin.php

Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19     2011-10-29 13:12:18 UTC (rev 101259)
+++ trunk/phase3/RELEASE-NOTES-1.19     2011-10-29 13:21:22 UTC (rev 101260)
@@ -120,6 +120,8 @@
 * (bug 31921) Magic words REVISIONDAY, REVISIONMONTH and REVISIONYEAR now give
   current values on preview
 * (bug 29912) Unit tests break if parsertest tables are still present
+* (bug 19186) Special:UserLogin's title on Special:SpecialPages now says
+  "create account" when the user cannot create an account
 
 === API changes in 1.19 ===
 * (bug 19838) siprop=interwikimap can now use the interwiki cache.

Modified: trunk/phase3/includes/specials/SpecialUserlogin.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUserlogin.php 2011-10-29 13:12:18 UTC 
(rev 101259)
+++ trunk/phase3/includes/specials/SpecialUserlogin.php 2011-10-29 13:21:22 UTC 
(rev 101260)
@@ -139,12 +139,18 @@
                }
        }
 
+       function getDescription() {
+               return $this->msg( $this->getUser()->isAllowed( 'createaccount' 
) ?
+                       'userlogin' : 'userloginnocreate' )->text();
+       }
+
        public function execute( $par ) {
                if ( session_id() == '' ) {
                        wfSetupSession();
                }
 
                $this->load();
+               $this->setHeaders();
 
                if ( $par == 'signup' ) { # Check for 
[[Special:Userlogin/signup]]
                        $this->mType = 'signup';
@@ -1074,14 +1080,7 @@
                        wfRunHooks( 'UserLoginForm', array( &$template ) );
                }
 
-               // Changes the title depending on permissions for creating 
account
                $out = $this->getOutput();
-               if ( $user->isAllowed( 'createaccount' ) ) {
-                       $out->setPageTitle( $this->msg( 'userlogin' ) );
-               } else {
-                       $out->setPageTitle( $this->msg( 'userloginnocreate' ) );
-               }
-
                $out->disallowUserJs(); // just in case...
                $out->addTemplate( $template );
        }


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to