diff options
| author | Marek A. R <aptx@phpbb.com> | 2008-08-15 13:00:20 +0000 |
|---|---|---|
| committer | Marek A. R <aptx@phpbb.com> | 2008-08-15 13:00:20 +0000 |
| commit | 4235be4bcb07a121afd0b6a202fb7b3823dcce67 (patch) | |
| tree | e8a6806b2c25c1ee7a8fb583401e7c9fb9d2d6e4 /phpBB/includes | |
| parent | f741c4ff0572cdb621ddd6312c8ccf79c56b850e (diff) | |
| download | forums-4235be4bcb07a121afd0b6a202fb7b3823dcce67.tar forums-4235be4bcb07a121afd0b6a202fb7b3823dcce67.tar.gz forums-4235be4bcb07a121afd0b6a202fb7b3823dcce67.tar.bz2 forums-4235be4bcb07a121afd0b6a202fb7b3823dcce67.tar.xz forums-4235be4bcb07a121afd0b6a202fb7b3823dcce67.zip | |
PHP5.3 compatibility.
git-svn-id: file:///svn/phpbb/trunk@8759 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_ban.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php index 82c4d6e8c5..f00c1a7fb4 100644 --- a/phpBB/includes/acp/acp_ban.php +++ b/phpBB/includes/acp/acp_ban.php @@ -118,7 +118,7 @@ class acp_ban /** * Display ban options */ - function display_ban_options($mode) + static function display_ban_options($mode) { global $user, $db, $template; diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 0ab8ac6f6b..d2b9bb08bb 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -34,6 +34,12 @@ class acp_modules var $module_class = ''; var $parent_id; var $u_action; + var $p_master; + + function __construct(p_master $p_master) + { + $this->p_master = $p_master; + } function main($id, $mode) { @@ -624,7 +630,7 @@ class acp_modules if (!$ignore_acl && $row['module_auth']) { // We use zero as the forum id to check - global setting. - if (!p_master::module_auth($row['module_auth'], 0)) + if (!$this->p_master->module_auth($row['module_auth'], 0)) { continue; } |