aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-21 22:29:08 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-21 22:29:08 +0100
commit3c8d11f6cc945a695dd1abe0ac8948dadd3e46bd (patch)
tree550d2c42fac87600482036e3b2d76ef75a7151d0
parentb104bf5791e18bbd321db95d751abb1c7682fe9a (diff)
parentd7d4f681ca5e7d56acb24becbe48b6893bf5304d (diff)
downloadforums-3c8d11f6cc945a695dd1abe0ac8948dadd3e46bd.tar
forums-3c8d11f6cc945a695dd1abe0ac8948dadd3e46bd.tar.gz
forums-3c8d11f6cc945a695dd1abe0ac8948dadd3e46bd.tar.bz2
forums-3c8d11f6cc945a695dd1abe0ac8948dadd3e46bd.tar.xz
forums-3c8d11f6cc945a695dd1abe0ac8948dadd3e46bd.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/phpbb/captcha/plugins/recaptcha.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/phpbb/captcha/plugins/recaptcha.php b/phpBB/phpbb/captcha/plugins/recaptcha.php
index ea446d7bc3..584f3afec1 100644
--- a/phpBB/phpbb/captcha/plugins/recaptcha.php
+++ b/phpBB/phpbb/captcha/plugins/recaptcha.php
@@ -26,8 +26,10 @@ class recaptcha extends captcha_abstract
var $challenge;
var $response;
- // PHP4 Constructor
- function phpbb_recaptcha()
+ /**
+ * Constructor
+ */
+ public function __construct()
{
global $request;
$this->recaptcha_server = $request->is_secure() ? $this->recaptcha_server_secure : $this->recaptcha_server;