1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2020-01-09 20:34:59 +01:00
21 changed files with 110 additions and 46 deletions

View File

@@ -384,7 +384,9 @@ class context
if (is_array($key))
{
// Search array to get correct position
list($search_key, $search_value) = @each($key);
$search_key = key($key);
$search_value = current($key);
foreach ($block as $i => $val_ary)
{
if ($val_ary[$search_key] === $search_value)
@@ -481,7 +483,8 @@ class context
if (is_array($key))
{
// Search array to get correct position
list($search_key, $search_value) = @each($key);
$search_key = key($key);
$search_value = current($key);
$key = null;
foreach ($block as $i => $val_ary)