makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

PHP 5.3 compatibility.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8760 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Marek A. R 2008-08-15 19:46:51 +00:00
parent 1990ee2d4c
commit 3a2f8753f6
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/common.php
View file

@ -103,7 +103,7 @@ if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
} }
else else
{ {
set_magic_quotes_runtime(0); @set_magic_quotes_runtime(0);
// Be paranoid with passed vars // Be paranoid with passed vars
if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))

2
phpBB/install/index.php
View file

@ -108,7 +108,7 @@ if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
} }
else else
{ {
set_magic_quotes_runtime(0); @set_magic_quotes_runtime(0);
// Be paranoid with passed vars // Be paranoid with passed vars
if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')

2
phpBB/install/install_install.php
View file

@ -1478,7 +1478,7 @@ class install_install extends module
include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx); include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
$_module = &new acp_modules(); $_module = new acp_modules();
$module_classes = array('acp', 'mcp', 'ucp'); $module_classes = array('acp', 'mcp', 'ucp');
// Add categories // 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()), '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); unset($tmp);
@ -1183,7 +1183,7 @@ class install_update extends module
trigger_error('Chosen diff mode is not supported', E_USER_ERROR); trigger_error('Chosen diff mode is not supported', E_USER_ERROR);
} }
$renderer = &new $render_class(); $renderer = new $render_class();
$template->assign_vars(array( $template->assign_vars(array(
'DIFF_CONTENT' => $renderer->get_diff_content($diff), '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 // 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(); $empty = $diff->is_empty();
unset($tmp, $diff); 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 // 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(); $empty_1 = $diff->is_empty();
unset($tmp, $diff); 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 // 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(); $empty_2 = $diff->is_empty();
unset($tmp, $diff); unset($tmp, $diff);
@ -1428,7 +1428,7 @@ class install_update extends module
'file3' => file_get_contents($this->new_location . $original_file), '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); unset($tmp);
@ -1442,7 +1442,7 @@ class install_update extends module
'file2' => implode("\n", $diff->merged_orig_output()), '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(); $empty = $diff->is_empty();
if ($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 // 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(); $empty = $diff->is_empty();
if ($empty) if ($empty)
@ -1634,11 +1634,11 @@ class install_update extends module
$file3 = array_shift($args); $file3 = array_shift($args);
$tmp['file3'] = (!empty($file3) && is_string($file3)) ? file_get_contents($file3) : $file3; $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 else
{ {
$diff = &new diff($tmp['file1'], $tmp['file2']); $diff = new diff($tmp['file1'], $tmp['file2']);
} }
unset($tmp); unset($tmp);