Merge remote-tracking branch 'brunoais/ticket/10575' into develop

* brunoais/ticket/10575:
  [ticket/10575] Adding public visibility to the methods.
  [ticket/10575] Fixing non-static access to static functions get_instance
This commit is contained in:
Andreas Fischer 2012-04-05 17:22:41 +02:00
commit 8bc5e2ca5a
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
*/
function get_instance($name)
public static function get_instance($name)
{
global $phpbb_root_path, $phpEx;

View file

@ -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;

View file

@ -39,7 +39,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
}
}
function get_instance()
public static function get_instance()
{
return new phpbb_captcha_gd_wave();
}

View file

@ -39,7 +39,7 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
}
}
function get_instance()
public static function get_instance()
{
$instance = new phpbb_captcha_nogd();
return $instance;

View file

@ -98,7 +98,7 @@ class phpbb_captcha_qa
/**
* API function
*/
function get_instance()
public static function get_instance()
{
$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', '');
}
function get_instance()
public static function get_instance()
{
$instance = new phpbb_recaptcha();
return $instance;