From 756aa68b34e8584c7e010b2295ff63e485be1907 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 11 Aug 2014 08:04:14 +0200
Subject: [PATCH] [ticket/11854] Don't override get service name in nogd
PHPBB3-11854
---
phpBB/phpbb/captcha/plugins/nogd.php | 8 --------
phpBB/phpbb/captcha/plugins/recaptcha.php | 2 +-
2 files changed, 1 insertion(+), 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
@@ -25,14 +25,6 @@ class nogd extends captcha_abstract
return 'CAPTCHA_NO_GD';
}
- /**
- * @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
*/
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 :(