mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-28 12:30:42 +02:00
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
This commit is contained in:
@@ -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';
|
||||
|
||||
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);
|
||||
unset($$which_ary);
|
||||
$sql_in = ($which_ary == 'user_id_ary') ? array_map('intval', ${$which_ary}) : array_map('utf8_clean_string', ${$which_ary});
|
||||
unset(${$which_ary});
|
||||
|
||||
$user_id_ary = $username_ary = array();
|
||||
|
||||
|
Reference in New Issue
Block a user