aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template
diff options
context:
space:
mode:
author3D-I <marktravai@gmail.com>2019-01-06 04:14:00 +0100
committer3D-I <marktravai@gmail.com>2019-01-06 04:25:53 +0100
commit89f586e99e6617270e201bda9d38e32618d3db2f (patch)
treed506daeab0f4308274c29f1aac36e0476bd2ff6b /phpBB/phpbb/template
parenteead94c8a6829f43df6e0e97ecfa7ef566d92bc3 (diff)
parent871875d9aa3d0b0a17a0eb1936323d5737a438f5 (diff)
downloadforums-89f586e99e6617270e201bda9d38e32618d3db2f.tar
forums-89f586e99e6617270e201bda9d38e32618d3db2f.tar.gz
forums-89f586e99e6617270e201bda9d38e32618d3db2f.tar.bz2
forums-89f586e99e6617270e201bda9d38e32618d3db2f.tar.xz
forums-89f586e99e6617270e201bda9d38e32618d3db2f.zip
[ticket/15889] Use array version of sql_from tables in sql array
PHPBB3-15889
Diffstat (limited to 'phpBB/phpbb/template')
-rw-r--r--phpBB/phpbb/template/context.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index 2ba6d185ad..202e29ce00 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -201,7 +201,8 @@ class context
$pos = strpos($blocks[$i], '[');
$name = ($pos !== false) ? substr($blocks[$i], 0, $pos) : $blocks[$i];
$block = &$block[$name];
- $index = (!$pos || strpos($blocks[$i], '[]') === $pos) ? (count($block) - 1) : (min((int) substr($blocks[$i], $pos + 1, -1), count($block) - 1));
+ $block_count = empty($block) ? 0 : count($block) - 1;
+ $index = (!$pos || strpos($blocks[$i], '[]') === $pos) ? $block_count : (min((int) substr($blocks[$i], $pos + 1, -1), $block_count));
$block = &$block[$index];
}