diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-04-08 23:03:17 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-04-08 23:03:17 +0200 |
| commit | 9165a045c5dee06bb5c163281bb817369a1733a3 (patch) | |
| tree | 7e27a3e6720eb9943e0d344d92dc443cd5be77a9 /phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | |
| parent | e78fbfef9c6aac1349d18454a4292781d661795c (diff) | |
| parent | 26e7dd98b71655c7e09be02ebd3ef84765ce27b8 (diff) | |
| download | forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar.gz forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar.bz2 forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar.xz forums-9165a045c5dee06bb5c163281bb817369a1733a3.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (76 commits)
[ticket/10561] Removed extra tabs, changes made to $db->sql_query()
[ticket/10561] Changed $temp_style_id to $style_id
[ticket/10561] Added function desc for phpbb_style_is_active()
[ticket/10561] Casted $config['default_style'] to int
[ticket/10561] Reverted to phpbb_style_is_active()
[ticket/10561] Added to database_update:database_update_info()
[ticket/10561] Added section in database_update.php
[ticket/10764] FAQ now mentions Area51 instead of SourceForge
[ticket/10764] FAQ now mentions GitHub instead of SourceForge
[ticket/10455] Removed NOTE from prosilver overall_header.html.
[ticket/10561] Moved and renamed the funtion validate_style().
[ticket/10575] Adding public visibility to the methods.
[ticket/10575] Fixing non-static access to static functions get_instance
[ticket/10547] User is not logged in as admin after installation
[ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
[ticket/10650] Added checking for empty subjects
[ticket/10650] Corrected intendation
[ticket/10650]Added permission checking and utf8 functions
[ticket/10650] Cropped subject and inserted newline
[ticket/10650] Corrected space before true
...
Diffstat (limited to 'phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php')
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index a63b0e448f..6c1f3bf00b 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 } } - function get_instance() + public static function get_instance() { $instance = new phpbb_captcha_gd(); return $instance; |