(bug 20115) Special:Userlogin says "Log in / create account" even if the user can...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4acd727..fed260e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -674,6 +674,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 21986) Special page names were are now capitalized by content language
 * If two log type have the same description, they're now both displayed in the
   type selector on Special:Log
+* (bug 20115) Special:Userlogin title says "Log in / create account" even if the
+  user can't create an account
 
 == API changes in 1.16 ==
 

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 1ba44d4..b167f91 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -947,7 +947,15 @@ class LoginForm {
                        wfRunHooks( 'UserLoginForm', array( &$template ) );
                }
 
-               $wgOut->setPageTitle( wfMsg( 'userlogin' ) );
+               //Changes the title depending on permissions for creating account
+               if ($wgUser->isAllowed( 'createaccount' ))
+               {
+                       $wgOut->setPageTitle( wfMsg( 'userlogin' ) );
+               } else
+               {
+                       $wgOut->setPageTitle( wfMsg( 'userloginnocreate' ) );
+               }
+
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
                $wgOut->disallowUserJs();  // just in case...

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 3e4a541..dac2508 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1044,6 +1044,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'login'                      => 'Log in',
 'nav-login-createaccount'    => 'Log in / create account',
 'loginprompt'                => 'You must have cookies enabled to log in to {{SITENAME}}.',
+'userloginnocreate'          => 'Log in',
 'userlogin'                  => 'Log in / create account',
 'logout'                     => 'Log out',
 'userlogout'                 => 'Log out',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index a9136e5..159977c 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -412,6 +412,7 @@ $wgMessageStructure = array(
                'nav-login-createaccount',
                'loginprompt',
                'userlogin',
+               'userloginnocreate',
                'logout',
                'userlogout',
                'notloggedin',