diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-30 18:16:16 -0400 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-30 18:16:16 -0400 |
| commit | e0e3622ba9571e7fd2ab5d86e4544d9757c0ac5d (patch) | |
| tree | 373979adebce060b989d893a81a8cc34412a5a42 /phpBB | |
| parent | c9ad0c6f25ddee3d433ec50b587c0a6668d4a174 (diff) | |
| parent | 31781adf0ca9880069c8831177b34d573456f5d4 (diff) | |
| download | forums-e0e3622ba9571e7fd2ab5d86e4544d9757c0ac5d.tar forums-e0e3622ba9571e7fd2ab5d86e4544d9757c0ac5d.tar.gz forums-e0e3622ba9571e7fd2ab5d86e4544d9757c0ac5d.tar.bz2 forums-e0e3622ba9571e7fd2ab5d86e4544d9757c0ac5d.tar.xz forums-e0e3622ba9571e7fd2ab5d86e4544d9757c0ac5d.zip | |
Merge remote-tracking branch 'p/ticket/11159-develop' into develop
* p/ticket/11159-develop:
[ticket/11159] static public is the currently approved order.
Diffstat (limited to 'phpBB')
5 files changed, 5 insertions, 5 deletions
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; diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php index a5588178bb..bc61397fe6 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php @@ -39,7 +39,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha } } - public static function get_instance() + static public function get_instance() { return new phpbb_captcha_gd_wave(); } diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php index 96f13fbe1b..b3764f6f81 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php @@ -39,7 +39,7 @@ class phpbb_captcha_nogd extends phpbb_default_captcha } } - public static function get_instance() + static public function get_instance() { $instance = new phpbb_captcha_nogd(); return $instance; diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php index 99813189d7..8fc45db8cb 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php @@ -98,7 +98,7 @@ class phpbb_captcha_qa /** * API function */ - public static function get_instance() + static public function get_instance() { $instance = new phpbb_captcha_qa(); diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php index 70c24a8c30..cdda89eb10 100644 --- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php @@ -54,7 +54,7 @@ class phpbb_recaptcha extends phpbb_default_captcha $this->response = request_var('recaptcha_response_field', ''); } - public static function get_instance() + static public function get_instance() { $instance = new phpbb_recaptcha(); return $instance; |