From c0e3cb183356b038f2d70983ae07af3b28ca2eb5 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 20 Oct 2015 22:25:20 +1030 Subject: [PATCH] Don't use array_filter flag (PHP 5.6 only) --- .../core/src/Http/Controller/AbstractClientController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/core/src/Http/Controller/AbstractClientController.php b/framework/core/src/Http/Controller/AbstractClientController.php index 4512f8d8c..7bd942f30 100644 --- a/framework/core/src/Http/Controller/AbstractClientController.php +++ b/framework/core/src/Http/Controller/AbstractClientController.php @@ -312,12 +312,14 @@ abstract class AbstractClientController extends AbstractHtmlController */ protected function filterTranslations(array $translations, array $keys) { - return array_filter($translations, function ($id) use ($keys) { + $filtered = array_filter(array_keys($translations), function ($id) use ($keys) { foreach ($keys as $key) { if (substr($id, 0, strlen($key)) === $key) { return true; } } - }, ARRAY_FILTER_USE_KEY); + }); + + return array_only($translations, $filtered); } }