Merge "Fix form submission on Special:RandomInCategory"

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

diff --git a/includes/User.php b/includes/User.php
index 2923026..25b35b3 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2612,6 +2612,9 @@ class User {
                } else {
                        $https = $this->getBoolOption( 'prefershttps' );
                        wfRunHooks( 'UserRequiresHTTPS', array( $this, &$https ) );
+                       if ( $https ) {
+                               $https = wfCanIPUseHTTPS( $this->getRequest()->getIP() );
+                       }
                        return $https;
                }
        }