aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-11-06 16:43:48 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-11-06 16:43:48 -0500
commit644662bc2cee77de5e43134635b82fe5acd03538 (patch)
tree941995cf59ffe69c798797e92c8bdac9ea137824
parent196ed8ef9f063eb4293e740725d1f1c31276fed9 (diff)
downloadforums-644662bc2cee77de5e43134635b82fe5acd03538.tar
forums-644662bc2cee77de5e43134635b82fe5acd03538.tar.gz
forums-644662bc2cee77de5e43134635b82fe5acd03538.tar.bz2
forums-644662bc2cee77de5e43134635b82fe5acd03538.tar.xz
forums-644662bc2cee77de5e43134635b82fe5acd03538.zip
[ticket/11159] Static public is the currently approved order.
PHPBB3-11159
-rw-r--r--phpBB/includes/captcha/captcha_factory.php2
-rw-r--r--phpBB/includes/functions_compress.php2
-rw-r--r--tests/cron/ext/testext/cron/dummy_task.php2
-rw-r--r--tests/cron/includes/cron/task/core/dummy_task.php2
-rw-r--r--tests/cron/includes/cron/task/core/second_dummy_task.php2
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()
{