tweak for r39376: do not show the check box "remember my password" if $wgEnablePersis...

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index de0c0d6..e30a4ec 100644 (file)
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -511,13 +511,13 @@ class PreferencesForm {
         * @access private
         */
        function mainPrefsForm( $status , $message = '' ) {
-               global $wgUser, $wgOut, $wgLang, $wgContLang;
+               global $wgUser, $wgOut, $wgLang, $wgContLang, $wgAuth;
                global $wgAllowRealName, $wgImageLimits, $wgThumbLimits;
                global $wgDisableLangConversion, $wgDisableTitleConversion;
                global $wgEnotifWatchlist, $wgEnotifUserTalk,$wgEnotifMinorEdits;
                global $wgRCShowWatchingUsers, $wgEnotifRevealEditorAddress;
                global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
-               global $wgContLanguageCode, $wgDefaultSkin, $wgAuth;
+               global $wgContLanguageCode, $wgDefaultSkin, $wgEnablePersistentCookies;
                global $wgEmailConfirmToEdit, $wgAjaxSearch, $wgEnableMWSuggest;
 
                $wgOut->setPageTitle( wfMsg( 'preferences' ) );
@@ -762,13 +762,19 @@ class PreferencesForm {
                                $this->tableRow(
                                        Xml::label( wfMsg( 'retypenew' ), 'wpRetypePass' ),
                                        Xml::password( 'wpRetypePass', 25, $this->mRetypePass, array( 'id' => 'wpRetypePass' ) )
-                               ) .
-                               Xml::tags( 'tr', null,
-                                       Xml::tags( 'td', array( 'colspan' => '2' ),
-                                               $this->getToggle( "rememberpassword" )
-                                       )
                                )
                        );
+                       if( $wgEnablePersistentCookies ){
+                               $wgOut->addHTML(
+                                       Xml::tags( 'tr', null,
+                                               Xml::tags( 'td', array( 'colspan' => '2' ),
+                                                       $this->getToggle( "rememberpassword" )
+                                               )
+                                       )
+                               );
+                       } else {
+                               $this->mUsedToggles['rememberpassword'] = true;
+                       }
                }
 
                # <FIXME>

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index cc9c927..dfc0b39 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -738,7 +738,7 @@ class LoginForm {
        function mainLoginForm( $msg, $msgtype = 'error' ) {
                global $wgUser, $wgOut, $wgAllowRealName, $wgEnableEmail;
                global $wgCookiePrefix, $wgAuth, $wgLoginLanguageSelector;
-               global $wgAuth, $wgEmailConfirmToEdit;
+               global $wgAuth, $wgEmailConfirmToEdit, $wgEnablePersistentCookies;
                
                $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
                
@@ -816,6 +816,7 @@ class LoginForm {
                $template->set( 'useemail', $wgEnableEmail );
                $template->set( 'emailrequired', $wgEmailConfirmToEdit );
                $template->set( 'canreset', $wgAuth->allowPasswordChange() );
+               $template->set( 'canremember', (bool)$wgEnablePersistentCookies );
                $template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember  );
 
                # Prepare language selection links as needed

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index deeeb27..02397ea 100644 (file)
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -63,7 +63,8 @@ class UserloginTemplate extends QuickTemplate {
                                </select>
                        </td>
                </tr>
-       <?php } ?>
+       <?php }
+       if( $this->data['canremember'] ) { ?>
                <tr>
                        <td></td>
                        <td class="mw-input">
@@ -74,6 +75,7 @@ class UserloginTemplate extends QuickTemplate {
                                        /> <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
                        </td>
                </tr>
+               <?php } ?>
                <tr>
                        <td></td>
                        <td class="mw-submit">
@@ -196,6 +198,7 @@ class UsercreateTemplate extends QuickTemplate {
                                        </td>
                        <?php } ?>
                </tr>
+               <?php if( $this->data['canremember'] ) { ?>
                <tr>
                        <td></td>
                        <td class="mw-input">
@@ -206,7 +209,8 @@ class UsercreateTemplate extends QuickTemplate {
                                        /> <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
                        </td>
                </tr>
-<?php
+<?php   }
+
                $tabIndex = 8;
                if ( isset( $this->data['extraInput'] ) && is_array( $this->data['extraInput'] ) ) {
                        foreach ( $this->data['extraInput'] as $inputItem ) { ?>