Permalink
Browse files

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
  • Loading branch information...
2 parents 8b80f81 + 2bf1c4e commit 8bc5e2ca5a702311fc8bb48aab422da65b972cf1 @bantu bantu committed Apr 5, 2012
View
2 phpBB/includes/captcha/captcha_factory.php
@@ -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
2 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -49,7 +49,7 @@ function phpbb_captcha_gd()
}
}
- function get_instance()
+ public static function get_instance()
{
$instance = new phpbb_captcha_gd();
return $instance;
View
2 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -39,7 +39,7 @@ function phpbb_captcha_gd_wave()
}
}
- function get_instance()
+ public static function get_instance()
{
return new phpbb_captcha_gd_wave();
}
View
2 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -39,7 +39,7 @@ function phpbb_captcha_nogd()
}
}
- function get_instance()
+ public static function get_instance()
{
$instance = new phpbb_captcha_nogd();
return $instance;
View
2 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -98,7 +98,7 @@ function init($type)
/**
* API function
*/
- function get_instance()
+ public static function get_instance()
{
$instance = new phpbb_captcha_qa();
View
2 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -54,7 +54,7 @@ function init($type)
$this->response = request_var('recaptcha_response_field', '');
}
- function get_instance()
+ public static function get_instance()
{
$instance = new phpbb_recaptcha();
return $instance;

0 comments on commit 8bc5e2c

Please sign in to comment.