mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

PHP5.3 compatibility.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8759 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Marek A. R 2008-08-15 13:00:20 +00:00
parent f741c4ff05
commit 4235be4bcb
6 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/common.php
View File

@ -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'))

2
phpBB/includes/acp/acp_ban.php
View File

@ -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;

8
phpBB/includes/acp/acp_modules.php
View File

@ -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;
}

2
phpBB/install/index.php
View File

@ -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')

2
phpBB/install/install_install.php
View File

@ -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

20
phpBB/install/install_update.php
View File

@ -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);