aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-02-11 16:53:25 +0100
committerAndreas Fischer <bantu@phpbb.com>2015-02-11 16:53:25 +0100
commit069738a1f264c2966b78473a84dba90b4e6d3051 (patch)
tree657c434ab8aefa461a262f7a76b1a3405c5d8ce9 /phpBB/includes/functions_user.php
parentacf3744297303324490c484156f0bf808e532883 (diff)
parent39a3f4f6c8d31f3310e287a51aea011fadae7931 (diff)
downloadforums-069738a1f264c2966b78473a84dba90b4e6d3051.tar
forums-069738a1f264c2966b78473a84dba90b4e6d3051.tar.gz
forums-069738a1f264c2966b78473a84dba90b4e6d3051.tar.bz2
forums-069738a1f264c2966b78473a84dba90b4e6d3051.tar.xz
forums-069738a1f264c2966b78473a84dba90b4e6d3051.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index e4f237b686..08dc47f8b3 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -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();