aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-11-10 14:02:45 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-11-10 14:02:45 +0100
commit40f3ae1d8fd9747afa7bf115a406f4b184146162 (patch)
tree1b0e7091a79746feba1d577dffbb5f26baec8bc2 /phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
parent29fdad396d62398f9544ebcfe5ac19cdaad5b120 (diff)
parent195014867ae84fe04ec01c913e38bf1d435590f7 (diff)
downloadforums-40f3ae1d8fd9747afa7bf115a406f4b184146162.tar
forums-40f3ae1d8fd9747afa7bf115a406f4b184146162.tar.gz
forums-40f3ae1d8fd9747afa7bf115a406f4b184146162.tar.bz2
forums-40f3ae1d8fd9747afa7bf115a406f4b184146162.tar.xz
forums-40f3ae1d8fd9747afa7bf115a406f4b184146162.zip
Merge remote-tracking branch 'igorw/ticket/11183' into develop
* igorw/ticket/11183: [ticket/11183] Remove $load_extensions and weird dl() calls
Diffstat (limited to 'phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php')
-rw-r--r--phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php14
1 files changed, 1 insertions, 13 deletions
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');
}
/**