diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-08-18 22:25:17 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-08-18 22:26:30 +0200 |
| commit | f84460c710f528724fac68278361af7fe18e458c (patch) | |
| tree | a6d8558e8372d4174712cfdd842ff5ae2c17230d /phpBB/includes | |
| parent | a48889fed83b007202e76ddf1ba5436eca310df0 (diff) | |
| download | forums-f84460c710f528724fac68278361af7fe18e458c.tar forums-f84460c710f528724fac68278361af7fe18e458c.tar.gz forums-f84460c710f528724fac68278361af7fe18e458c.tar.bz2 forums-f84460c710f528724fac68278361af7fe18e458c.tar.xz forums-f84460c710f528724fac68278361af7fe18e458c.zip | |
[feature/request-class] Make use of the is_secure() method
PHPBB3-9716
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php index 2272b10841..9e677f8223 100644 --- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php @@ -42,7 +42,7 @@ class phpbb_recaptcha extends phpbb_default_captcha function phpbb_recaptcha() { global $request; - $this->recaptcha_server = $request->server('HTTPS') == 'on' ? $this->recaptcha_server_secure : $this->recaptcha_server; + $this->recaptcha_server = $request->is_secure() ? $this->recaptcha_server_secure : $this->recaptcha_server; } function init($type) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9ae1885efd..a4baaa8af1 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2069,7 +2069,7 @@ function generate_board_url($without_script_path = false) else { // Do not rely on cookie_secure, users seem to think that it means a secured cookie instead of an encrypted connection - $cookie_secure = $request->server('HTTPS') == 'on' ? 1 : 0; + $cookie_secure = $request->is_secure() ? 1 : 0; $url = (($cookie_secure) ? 'https://' : 'http://') . $server_name; $script_path = $user->page['root_script_path']; |