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

[ticket/13597] Modify variable-variable syntax to be compatible with PHP7

Browse source 
PHPBB3-13597
This commit is contained in:
Marc Alexander 2015-02-11 12:03:54 +01:00
parent c6a371531b
commit 3df25babce
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/develop/add_permissions.php
View file

@ -198,9 +198,9 @@ $prefixes = array('f_', 'a_', 'm_', 'u_');
foreach ($prefixes as $prefix) foreach ($prefixes as $prefix)
{ {
$var = $prefix . 'permissions'; $var = $prefix . 'permissions';
if (sizeof($$var)) if (sizeof(${$var}))
{ {
foreach ($$var as $auth_option => $l_ary) foreach (${$var} as $auth_option => $l_ary)
{ {
$sql_ary = array( $sql_ary = array(
'auth_option' => $auth_option, 'auth_option' => $auth_option,

2
phpBB/includes/acp/acp_profile.php
View file

@ -460,7 +460,7 @@ class acp_profile
if (!$cp->vars[$key] && $action == 'edit') if (!$cp->vars[$key] && $action == 'edit')
{ {
$cp->vars[$key] = $$key; $cp->vars[$key] = ${$key};
} }
$field_data = $cp->vars; $field_data = $cp->vars;

6
phpBB/includes/functions_content.php
View file

@ -78,7 +78,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
foreach ($sorts as $name => $sort_ary) foreach ($sorts as $name => $sort_ary)
{ {
$key = $sort_ary['key']; $key = $sort_ary['key'];
$selected = $$sort_ary['key']; $selected = ${$sort_ary['key']};
// Check if the key is selectable. If not, we reset to the default or first key found. // Check if the key is selectable. If not, we reset to the default or first key found.
// This ensures the values are always valid. We also set $sort_dir/sort_key/etc. to the // This ensures the values are always valid. We also set $sort_dir/sort_key/etc. to the
@ -87,12 +87,12 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
{ {
if ($sort_ary['default'] !== false) if ($sort_ary['default'] !== false)
{ {
$selected = $$key = $sort_ary['default']; $selected = ${$key} = $sort_ary['default'];
} }
else else
{ {
@reset($sort_ary['options']); @reset($sort_ary['options']);
$selected = $$key = key($sort_ary['options']); $selected = ${$key} = key($sort_ary['options']);
} }
} }

2
phpBB/includes/functions_messenger.php
View file

@ -510,7 +510,7 @@ class messenger
foreach ($address_ary as $which_ary) foreach ($address_ary as $which_ary)
{ {
$$type .= (($$type != '') ? ', ' : '') . (($which_ary['name'] != '') ? mail_encode($which_ary['name'], $encode_eol) . ' <' . $which_ary['email'] . '>' : $which_ary['email']); ${$type} .= ((${$type} != '') ? ', ' : '') . (($which_ary['name'] != '') ? mail_encode($which_ary['name'], $encode_eol) . ' <' . $which_ary['email'] . '>' : $which_ary['email']);
} }
} }

4
phpBB/includes/functions_privmsgs.php
View file

@ -1415,9 +1415,9 @@ function rebuild_header($check_ary)
$_types = array('u', 'g'); $_types = array('u', 'g');
foreach ($_types as $type) foreach ($_types as $type)
{ {
if (sizeof($$type)) if (sizeof(${$type}))
{ {
foreach ($$type as $id) foreach (${$type} as $id)
{ {
$address[$type][$id] = $check_type; $address[$type][$id] = $check_type;
} }

8
phpBB/includes/functions_user.php
View file

@ -44,13 +44,13 @@ function user_get_id_name(&$user_id_ary, &$username_ary, $user_type = false)
$which_ary = ($user_id_ary) ? 'user_id_ary' : 'username_ary'; $which_ary = ($user_id_ary) ? 'user_id_ary' : 'username_ary';
if ($$which_ary && !is_array($$which_ary)) if (${$which_ary} && !is_array(${$which_ary}))
{ {
$$which_ary = array($$which_ary); ${$which_ary} = array(${$which_ary});
} }
$sql_in = ($which_ary == 'user_id_ary') ? array_map('intval', $$which_ary) : array_map('utf8_clean_string', $$which_ary); $sql_in = ($which_ary == 'user_id_ary') ? array_map('intval', ${$which_ary}) : array_map('utf8_clean_string', ${$which_ary});
unset($$which_ary); unset(${$which_ary});
$user_id_ary = $username_ary = array(); $user_id_ary = $username_ary = array();

2
phpBB/install/install_convert.php
View file

@ -599,7 +599,7 @@ class install_convert extends module
'S_EXPLAIN' => $vars['explain'], 'S_EXPLAIN' => $vars['explain'],
'S_LEGEND' => false, 'S_LEGEND' => false,
'TITLE_EXPLAIN' => ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '', 'TITLE_EXPLAIN' => ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '',
'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], $$config_key, $options), 'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], ${$config_key}, $options),
) )
); );
} }