Merge "includes/Linker.php: Added hook for "Media:" links"

[lhc/web/wiklou.git] / includes / Preferences.php

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 1825cce..4b91386 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -301,14 +301,6 @@ class Preferences {
                                'section' => 'personal/info',
                        );
                }
-               if ( $wgCookieExpiration > 0 ) {
-                       $defaultPreferences['rememberpassword'] = array(
-                               'type' => 'toggle',
-                               'label' => $context->msg( 'tog-rememberpassword' )->numParams(
-                                       ceil( $wgCookieExpiration / ( 3600 * 24 ) ) )->text(),
-                               'section' => 'personal/info',
-                       );
-               }
                // Only show prefershttps if secure login is turned on
                if ( $wgSecureLogin && wfCanIPUseHTTPS( $context->getRequest()->getIP() ) ) {
                        $defaultPreferences['prefershttps'] = array(
@@ -1475,7 +1467,7 @@ class Preferences {
         * Caller is responsible for checking $wgAuth and 'editmyprivateinfo'
         * right.
         *
-        * @deprecated in 1.20; use User::setEmailWithConfirmation() instead.
+        * @deprecated since 1.20; use User::setEmailWithConfirmation() instead.
         * @param $user User
         * @param string $newaddr New email address
         * @return Array (true on success or Status on failure, info string)
@@ -1492,7 +1484,7 @@ class Preferences {
        }
 
        /**
-        * @deprecated in 1.19
+        * @deprecated since 1.19
         * @param $user User
         * @return array
         */