Merge remote-tracking branch 'p/ticket/11159-develop' into develop

* p/ticket/11159-develop:
  [ticket/11159] static public is the currently approved order.
This commit is contained in:
Andreas Fischer 2012-10-30 18:16:16 -04:00
commit e0e3622ba9
5 changed files with 5 additions and 5 deletions

View file

@ -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(); $instance = new phpbb_captcha_gd();
return $instance; return $instance;

View file

@ -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(); return new phpbb_captcha_gd_wave();
} }

View file

@ -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(); $instance = new phpbb_captcha_nogd();
return $instance; return $instance;

View file

@ -98,7 +98,7 @@ class phpbb_captcha_qa
/** /**
* API function * API function
*/ */
public static function get_instance() static public function get_instance()
{ {
$instance = new phpbb_captcha_qa(); $instance = new phpbb_captcha_qa();

View file

@ -54,7 +54,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
$this->response = request_var('recaptcha_response_field', ''); $this->response = request_var('recaptcha_response_field', '');
} }
public static function get_instance() static public function get_instance()
{ {
$instance = new phpbb_recaptcha(); $instance = new phpbb_recaptcha();
return $instance; return $instance;