diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-02-11 16:53:25 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-11 16:53:25 +0100 |
| commit | 069738a1f264c2966b78473a84dba90b4e6d3051 (patch) | |
| tree | 657c434ab8aefa461a262f7a76b1a3405c5d8ce9 /phpBB/includes/functions_content.php | |
| parent | acf3744297303324490c484156f0bf808e532883 (diff) | |
| parent | 39a3f4f6c8d31f3310e287a51aea011fadae7931 (diff) | |
| download | forums-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_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 8e1705d320..bdbc8a92fa 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -78,7 +78,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, foreach ($sorts as $name => $sort_ary) { $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. // 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) { - $selected = $$key = $sort_ary['default']; + $selected = ${$key} = $sort_ary['default']; } else { @reset($sort_ary['options']); - $selected = $$key = key($sort_ary['options']); + $selected = ${$key} = key($sort_ary['options']); } } |