diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-11-08 23:57:33 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-11-08 23:57:33 +0100 |
| commit | 5d37c171c2c47be5e718b9a5e961a365c8f02f19 (patch) | |
| tree | 229e0fd022b6d275ceffcea4ee8ca312fa87bf9f | |
| parent | fc41b52cea379835b12950d4bdef2ca5c0d11246 (diff) | |
| parent | 644662bc2cee77de5e43134635b82fe5acd03538 (diff) | |
| download | forums-5d37c171c2c47be5e718b9a5e961a365c8f02f19.tar forums-5d37c171c2c47be5e718b9a5e961a365c8f02f19.tar.gz forums-5d37c171c2c47be5e718b9a5e961a365c8f02f19.tar.bz2 forums-5d37c171c2c47be5e718b9a5e961a365c8f02f19.tar.xz forums-5d37c171c2c47be5e718b9a5e961a365c8f02f19.zip | |
Merge remote-tracking branch 'p/ticket/11159' into develop
* p/ticket/11159:
[ticket/11159] Static public is the currently approved order.
| -rw-r--r-- | phpBB/includes/captcha/captcha_factory.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_compress.php | 2 | ||||
| -rw-r--r-- | tests/cron/ext/testext/cron/dummy_task.php | 2 | ||||
| -rw-r--r-- | tests/cron/includes/cron/task/core/dummy_task.php | 2 | ||||
| -rw-r--r-- | tests/cron/includes/cron/task/core/second_dummy_task.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php index d57b333c69..1ed8e119b5 100644 --- a/phpBB/includes/captcha/captcha_factory.php +++ b/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 */ - public static function get_instance($name) + static public function get_instance($name) { global $phpbb_root_path, $phpEx; diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php index 4675394633..c79a31930e 100644 --- a/phpBB/includes/functions_compress.php +++ b/phpBB/includes/functions_compress.php @@ -162,7 +162,7 @@ class compress * * @return array Array of strings of available compression methods (.tar, .tar.gz, .zip, etc.) */ - public static function methods() + static public function methods() { $methods = array('.tar'); $available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib'); diff --git a/tests/cron/ext/testext/cron/dummy_task.php b/tests/cron/ext/testext/cron/dummy_task.php index a31806c1b1..3e81db1895 100644 --- a/tests/cron/ext/testext/cron/dummy_task.php +++ b/tests/cron/ext/testext/cron/dummy_task.php @@ -9,7 +9,7 @@ class phpbb_ext_testext_cron_dummy_task extends phpbb_cron_task_base { - public static $was_run = 0; + static public $was_run = 0; public function get_name() { diff --git a/tests/cron/includes/cron/task/core/dummy_task.php b/tests/cron/includes/cron/task/core/dummy_task.php index ce3e91a9ba..c94455603f 100644 --- a/tests/cron/includes/cron/task/core/dummy_task.php +++ b/tests/cron/includes/cron/task/core/dummy_task.php @@ -9,7 +9,7 @@ class phpbb_cron_task_core_dummy_task extends phpbb_cron_task_base { - public static $was_run = 0; + static public $was_run = 0; public function get_name() { diff --git a/tests/cron/includes/cron/task/core/second_dummy_task.php b/tests/cron/includes/cron/task/core/second_dummy_task.php index 76a55588f9..77ef6f70ed 100644 --- a/tests/cron/includes/cron/task/core/second_dummy_task.php +++ b/tests/cron/includes/cron/task/core/second_dummy_task.php @@ -9,7 +9,7 @@ class phpbb_cron_task_core_second_dummy_task extends phpbb_cron_task_base { - public static $was_run = 0; + static public $was_run = 0; public function get_name() { |