[ticket/10575] Fixing non-static access to static functions get_instance

These changes should solve the strict standards error about accessing
the non-static get_instance() in a non-static way.
For that, I changed the get_instance methods to static methods.

PHPBB3-10575
This commit is contained in:
Bruno Ais 2012-04-05 14:14:40 +01:00
parent cddd63aae0
commit c8da69d9c2
6 changed files with 6 additions and 6 deletions

View file

@ -25,7 +25,7 @@ class phpbb_captcha_factory
/** /**
* return an instance of class $name in file $name_plugin.php * return an instance of class $name in file $name_plugin.php
*/ */
function get_instance($name) static function get_instance($name)
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;

View file

@ -49,7 +49,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
} }
} }
function get_instance() static 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
} }
} }
function get_instance() static 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
} }
} }
function get_instance() static 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
*/ */
function get_instance() static 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', '');
} }
function get_instance() static function get_instance()
{ {
$instance = new phpbb_recaptcha(); $instance = new phpbb_recaptcha();
return $instance; return $instance;