From: Chad Horohoe <chadh@wikimedia.org>
Date: Fri, 23 Aug 2013 19:34:06 +0000 (-0700)
Subject: Only show prefershttps if IP can use HTTPS
X-Git-Tag: 1.31.0-rc.0~18899^2
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites_tous%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=9e7693c749a90646052c82a660845314226446c3;p=lhc%2Fweb%2Fwiklou.git

Only show prefershttps if IP can use HTTPS

Change-Id: I7493a329d35fad3f17aac2df935f4f9306828884
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 9791d8bdd3..4d034fa05a 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -315,7 +315,7 @@ 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',