Use ->parse() for messages on Special:ResetTokens

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

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 39a399f..84a3b7e 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -303,11 +303,10 @@ class Preferences {
                        );
                }
                // Only show preferhttps if secure login is turned on
-               if ( $wgSecureLogin ) {
+               if ( $wgSecureLogin && wfCanIPUseHTTPS( $context->getRequest()->getIP() ) ) {
                        $defaultPreferences['prefershttps'] = array(
                                'type' => 'toggle',
                                'label-message' => 'tog-prefershttps',
-                               'default' => true,
                                'section' => 'personal/info'
                        );
                }