diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-12-23 17:14:14 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-12-23 17:14:14 +0100 |
| commit | ca98cd413a6f01eb01e3ca60cea9b55409dadc61 (patch) | |
| tree | d035cb1e7c7d99fedd70976c47cf9d7d8a04c7ac | |
| parent | 70a56c208fa5bcdde9337c871b30aaaf7e5602b8 (diff) | |
| parent | 3bce8bce108b5d408c49f4f87929ce9a927f0cd2 (diff) | |
| download | forums-ca98cd413a6f01eb01e3ca60cea9b55409dadc61.tar forums-ca98cd413a6f01eb01e3ca60cea9b55409dadc61.tar.gz forums-ca98cd413a6f01eb01e3ca60cea9b55409dadc61.tar.bz2 forums-ca98cd413a6f01eb01e3ca60cea9b55409dadc61.tar.xz forums-ca98cd413a6f01eb01e3ca60cea9b55409dadc61.zip | |
Merge pull request #5479 from kasimi/ticket/15904
[ticket/15904] Fix counting empty template blocks
| -rw-r--r-- | phpBB/phpbb/template/context.php | 3 |
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]; } |