aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-08-11 08:04:14 +0200
committerTristan Darricau <github@nicofuma.fr>2014-08-11 08:04:14 +0200
commit756aa68b34e8584c7e010b2295ff63e485be1907 (patch)
treee04ace805ffdb4414c2105c86e52e2ad5349f181
parent4683864b4bb710a32a6a9078bfa2c7d929c3f1a1 (diff)
downloadforums-756aa68b34e8584c7e010b2295ff63e485be1907.tar
forums-756aa68b34e8584c7e010b2295ff63e485be1907.tar.gz
forums-756aa68b34e8584c7e010b2295ff63e485be1907.tar.bz2
forums-756aa68b34e8584c7e010b2295ff63e485be1907.tar.xz
forums-756aa68b34e8584c7e010b2295ff63e485be1907.zip
[ticket/11854] Don't override get service name in nogd
PHPBB3-11854
-rw-r--r--phpBB/phpbb/captcha/plugins/nogd.php8
-rw-r--r--phpBB/phpbb/captcha/plugins/recaptcha.php2
2 files changed, 1 insertions, 9 deletions
diff --git a/phpBB/phpbb/captcha/plugins/nogd.php b/phpBB/phpbb/captcha/plugins/nogd.php
index dbf0664a62..6845e5935c 100644
--- a/phpBB/phpbb/captcha/plugins/nogd.php
+++ b/phpBB/phpbb/captcha/plugins/nogd.php
@@ -26,14 +26,6 @@ class nogd extends captcha_abstract
}
/**
- * @return string the name of the service corresponding to the plugin
- */
- function get_service_name()
- {
- return 'core.captcha.plugins.nogd';
- }
-
- /**
* @return string the name of the class used to generate the captcha
*/
function get_generator_class()
diff --git a/phpBB/phpbb/captcha/plugins/recaptcha.php b/phpBB/phpbb/captcha/plugins/recaptcha.php
index 928694f6ca..ea446d7bc3 100644
--- a/phpBB/phpbb/captcha/plugins/recaptcha.php
+++ b/phpBB/phpbb/captcha/plugins/recaptcha.php
@@ -13,7 +13,7 @@
namespace phpbb\captcha\plugins;
-class recaptcha extends \phpbb\captcha\plugins\captcha_abstract
+class recaptcha extends captcha_abstract
{
var $recaptcha_server = 'http://www.google.com/recaptcha/api';
var $recaptcha_server_secure = 'https://www.google.com/recaptcha/api'; // class constants :(