aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarek A. R <aptx@phpbb.com>2008-08-15 13:00:20 +0000
committerMarek A. R <aptx@phpbb.com>2008-08-15 13:00:20 +0000
commit4235be4bcb07a121afd0b6a202fb7b3823dcce67 (patch)
treee8a6806b2c25c1ee7a8fb583401e7c9fb9d2d6e4 /phpBB
parentf741c4ff0572cdb621ddd6312c8ccf79c56b850e (diff)
downloadforums-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')
-rw-r--r--phpBB/common.php2
-rw-r--r--phpBB/includes/acp/acp_ban.php2
-rw-r--r--phpBB/includes/acp/acp_modules.php8
-rw-r--r--phpBB/install/index.php2
-rw-r--r--phpBB/install/install_install.php2
-rw-r--r--phpBB/install/install_update.php20
6 files changed, 21 insertions, 15 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index de4d41beae..97c02d4a23 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -104,7 +104,7 @@ if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
}
else
{
- set_magic_quotes_runtime(0);
+ @set_magic_quotes_runtime(0);
// Be paranoid with passed vars
if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))
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;
}
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index ef4b4bfebd..e3bfcba499 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -108,7 +108,7 @@ if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
}
else
{
- set_magic_quotes_runtime(0);
+ @set_magic_quotes_runtime(0);
// Be paranoid with passed vars
if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 7625100e7c..23e7c22dbb 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1493,7 +1493,7 @@ class install_install extends module
include_once(PHPBB_ROOT_PATH . 'includes/acp/acp_modules.' . PHP_EXT);
- $_module = &new acp_modules();
+ $_module = new acp_modules();
$module_classes = array('acp', 'mcp', 'ucp');
// Add categories
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 8bad2f7560..5a4f612a45 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -1106,7 +1106,7 @@ class install_update extends module
'file2' => ($option == MERGE_NEW_FILE) ? implode("\n", $diff->merged_new_output()) : implode("\n", $diff->merged_orig_output()),
);
- $diff = &new diff($tmp['file1'], $tmp['file2']);
+ $diff = new diff($tmp['file1'], $tmp['file2']);
unset($tmp);
@@ -1183,7 +1183,7 @@ class install_update extends module
trigger_error('Chosen diff mode is not supported', E_USER_ERROR);
}
- $renderer = &new $render_class();
+ $renderer = new $render_class();
$template->assign_vars(array(
'DIFF_CONTENT' => $renderer->get_diff_content($diff),
@@ -1346,7 +1346,7 @@ class install_update extends module
);
// We need to diff the contents here to make sure the file is really the one we expect
- $diff = &new diff($tmp['file1'], $tmp['file2'], false);
+ $diff = new diff($tmp['file1'], $tmp['file2'], false);
$empty = $diff->is_empty();
unset($tmp, $diff);
@@ -1381,7 +1381,7 @@ class install_update extends module
);
// We need to diff the contents here to make sure the file is really the one we expect
- $diff = &new diff($tmp['file1'], $tmp['file2'], false);
+ $diff = new diff($tmp['file1'], $tmp['file2'], false);
$empty_1 = $diff->is_empty();
unset($tmp, $diff);
@@ -1392,7 +1392,7 @@ class install_update extends module
);
// We need to diff the contents here to make sure the file is really the one we expect
- $diff = &new diff($tmp['file1'], $tmp['file2'], false);
+ $diff = new diff($tmp['file1'], $tmp['file2'], false);
$empty_2 = $diff->is_empty();
unset($tmp, $diff);
@@ -1428,7 +1428,7 @@ class install_update extends module
'file3' => file_get_contents($this->new_location . $original_file),
);
- $diff = &new diff3($tmp['file1'], $tmp['file2'], $tmp['file3'], false);
+ $diff = new diff3($tmp['file1'], $tmp['file2'], $tmp['file3'], false);
unset($tmp);
@@ -1442,7 +1442,7 @@ class install_update extends module
'file2' => implode("\n", $diff->merged_orig_output()),
);
- $diff = &new diff($tmp['file1'], $tmp['file2'], false);
+ $diff = new diff($tmp['file1'], $tmp['file2'], false);
$empty = $diff->is_empty();
if ($empty)
@@ -1465,7 +1465,7 @@ class install_update extends module
);
// now compare the merged output with the original file to see if the modified file is up to date
- $diff = &new diff($tmp['file1'], $tmp['file2'], false);
+ $diff = new diff($tmp['file1'], $tmp['file2'], false);
$empty = $diff->is_empty();
if ($empty)
@@ -1629,11 +1629,11 @@ class install_update extends module
$file3 = array_shift($args);
$tmp['file3'] = (!empty($file3) && is_string($file3)) ? file_get_contents($file3) : $file3;
- $diff = &new diff3($tmp['file1'], $tmp['file2'], $tmp['file3']);
+ $diff = new diff3($tmp['file1'], $tmp['file2'], $tmp['file3']);
}
else
{
- $diff = &new diff($tmp['file1'], $tmp['file2']);
+ $diff = new diff($tmp['file1'], $tmp['file2']);
}
unset($tmp);