1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge branch '3.2.x'

* 3.2.x:
  [ticket/15659] Fix retrieve_block_vars()
This commit is contained in:
Tristan Darricau
2018-07-08 18:43:17 +02:00
2 changed files with 106 additions and 0 deletions

View File

@@ -274,6 +274,11 @@ class context
{
$name = substr($blocks[$i], 0, $pos);
if (empty($block[$name]))
{
return array();
}
if (strpos($blocks[$i], '[]') === $pos)
{
$index = count($block[$name]) - 1;
@@ -286,6 +291,11 @@ class context
else
{
$name = $blocks[$i];
if (empty($block[$name]))
{
return array();
}
$index = count($block[$name]) - 1;
}
$block = $block[$name];