mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 15:01:33 +02:00
Code Issues Releases Wiki Activity

[ticket/14944] Add possibility to search for template loop indexes by key

Browse Source 
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.

PHPBB3-14944
This commit is contained in:
javiexin
2017-01-08 00:00:47 +01:00
parent c656bd60ef
commit 20c03cccdd
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/phpbb/template/context.php
View File

@@ -305,16 +305,28 @@ class context
$name = $blocks[$i];
$index = sizeof($block[$name]) - 1;
}
if (!isset($block[$name]))
{
return false;
}
$block = $block[$name];
if (!isset($block[$index]))
{
return false;
}
$block = $block[$index];
}
if (!isset($block[$blocks[$i]]))
{
return false;
}
$block = $block[$blocks[$i]]; // Traverse the last block
// Change key to zero (change first position) if false and to last position if true
if ($key === false || $key === true)
{
return ($key === false) ? 0 : sizeof($block);
return ($key === false) ? 0 : sizeof($block) - 1;
}
// Get correct position if array given
@@ -331,7 +343,7 @@ class context
}
}
return is_int($key) ? $key : false;
return (is_int($key) && ((0 <= $key) && ($key < sizeof($block)))) ? $key : false;
}
/**