| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1471,7 +1471,7 @@ |
| 1472 | 1472 | $wgShowUpdatedMarker = true; |
| 1473 | 1473 | |
| 1474 | 1474 | /** |
| 1475 | | - * Default cookie expiration time. Setting to 0 disables makes all cookies session-only. |
| | 1475 | + * Default cookie expiration time. Setting to 0 makes all cookies session-only. |
| 1476 | 1476 | */ |
| 1477 | 1477 | $wgCookieExpiration = 30*86400; |
| 1478 | 1478 | |
| Index: trunk/phase3/includes/specials/SpecialPreferences.php |
| — | — | @@ -517,7 +517,7 @@ |
| 518 | 518 | global $wgEnotifWatchlist, $wgEnotifUserTalk,$wgEnotifMinorEdits; |
| 519 | 519 | global $wgRCShowWatchingUsers, $wgEnotifRevealEditorAddress; |
| 520 | 520 | global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication; |
| 521 | | - global $wgContLanguageCode, $wgDefaultSkin, $wgEnablePersistentCookies; |
| | 521 | + global $wgContLanguageCode, $wgDefaultSkin, $wgCookieExpiration; |
| 522 | 522 | global $wgEmailConfirmToEdit, $wgAjaxSearch, $wgEnableMWSuggest; |
| 523 | 523 | |
| 524 | 524 | $wgOut->setPageTitle( wfMsg( 'preferences' ) ); |
| — | — | @@ -764,7 +764,7 @@ |
| 765 | 765 | Xml::password( 'wpRetypePass', 25, $this->mRetypePass, array( 'id' => 'wpRetypePass' ) ) |
| 766 | 766 | ) |
| 767 | 767 | ); |
| 768 | | - if( $wgEnablePersistentCookies ){ |
| | 768 | + if( $wgCookieExpiration > 0 ){ |
| 769 | 769 | $wgOut->addHTML( |
| 770 | 770 | Xml::tags( 'tr', null, |
| 771 | 771 | Xml::tags( 'td', array( 'colspan' => '2' ), |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -738,7 +738,7 @@ |
| 739 | 739 | function mainLoginForm( $msg, $msgtype = 'error' ) { |
| 740 | 740 | global $wgUser, $wgOut, $wgAllowRealName, $wgEnableEmail; |
| 741 | 741 | global $wgCookiePrefix, $wgAuth, $wgLoginLanguageSelector; |
| 742 | | - global $wgAuth, $wgEmailConfirmToEdit, $wgEnablePersistentCookies; |
| | 742 | + global $wgAuth, $wgEmailConfirmToEdit, $wgCookieExpiration; |
| 743 | 743 | |
| 744 | 744 | $titleObj = SpecialPage::getTitleFor( 'Userlogin' ); |
| 745 | 745 | |
| — | — | @@ -816,7 +816,7 @@ |
| 817 | 817 | $template->set( 'useemail', $wgEnableEmail ); |
| 818 | 818 | $template->set( 'emailrequired', $wgEmailConfirmToEdit ); |
| 819 | 819 | $template->set( 'canreset', $wgAuth->allowPasswordChange() ); |
| 820 | | - $template->set( 'canremember', $wgEnablePersistentCookies ); |
| | 820 | + $template->set( 'canremember', ( $wgCookieExpiration > 0 ) ); |
| 821 | 821 | $template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember ); |
| 822 | 822 | |
| 823 | 823 | # Prepare language selection links as needed |