diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-30 18:19:44 -0400 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-30 18:19:44 -0400 |
| commit | 1f248dab6f9413a67f08e008b36c9fc64489d1ce (patch) | |
| tree | 8e5c4e91baa1e23dca3bef30fd33942bca06ab90 /phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | |
| parent | e0e3622ba9571e7fd2ab5d86e4544d9757c0ac5d (diff) | |
| parent | d602f13d7f6ba7ee67a5286befd8afd9f8f0cd15 (diff) | |
| download | forums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.tar forums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.tar.gz forums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.tar.bz2 forums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.tar.xz forums-1f248dab6f9413a67f08e008b36c9fc64489d1ce.zip | |
Merge remote-tracking branch 'p/ticket/11157' into develop
* p/ticket/11157:
[ticket/11157] static public is the currently approved order.
[ticket/11157] Fix remaining captcha spam.
[ticket/11157] get_captcha_types is an instance method.
Diffstat (limited to 'phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php')
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index 1a3523567e..4ad34f2a26 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() + static public 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() + static public function get_name() { return 'CAPTCHA_GD'; } |