From 14a6e5ec73779d18cc6f09cb3b1cb4fd08f024f8 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Mon, 29 Oct 2012 09:34:51 -0400 Subject: [ticket/11157] Fix remaining captcha spam. PHPBB3-11157 --- phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php') diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index 6c1f3bf00b..e4503cabe4 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php @@ -55,7 +55,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha return $instance; } - function is_available() + public static function is_available() { global $phpbb_root_path, $phpEx; @@ -80,7 +80,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha return true; } - function get_name() + public static function get_name() { return 'CAPTCHA_GD'; } -- cgit v1.2.1 From d602f13d7f6ba7ee67a5286befd8afd9f8f0cd15 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Mon, 29 Oct 2012 14:54:54 -0400 Subject: [ticket/11157] static public is the currently approved order. PHPBB3-11157 --- phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php') diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index e4503cabe4..5328e64a86 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php @@ -55,7 +55,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha return $instance; } - public static function is_available() + static public function is_available() { global $phpbb_root_path, $phpEx; @@ -80,7 +80,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha return true; } - public static function get_name() + static public function get_name() { return 'CAPTCHA_GD'; } -- cgit v1.2.1 From 31781adf0ca9880069c8831177b34d573456f5d4 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Mon, 29 Oct 2012 14:57:27 -0400 Subject: [ticket/11159] static public is the currently approved order. PHPBB3-11159 --- phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php') diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index 6c1f3bf00b..1a3523567e 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php @@ -49,7 +49,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha } } - public static function get_instance() + static public function get_instance() { $instance = new phpbb_captcha_gd(); return $instance; -- cgit v1.2.1 From 195014867ae84fe04ec01c913e38bf1d435590f7 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 10 Nov 2012 11:25:22 +0100 Subject: [ticket/11183] Remove $load_extensions and weird dl() calls PHPBB3-11183 --- phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php') diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index 4ad34f2a26..c0c355f33b 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php @@ -57,19 +57,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha static public function is_available() { - global $phpbb_root_path, $phpEx; - - if (@extension_loaded('gd')) - { - return true; - } - - if (!function_exists('can_load_dll')) - { - include($phpbb_root_path . 'includes/functions_install.' . $phpEx); - } - - return can_load_dll('gd'); + return @extension_loaded('gd'); } /** -- cgit v1.2.1