From d58b23d6fa145bcd36af504240d38cede20de7fd Mon Sep 17 00:00:00 2001 From: Kirk Mayo Date: Mon, 12 Nov 2012 12:51:00 +1300 Subject: [PATCH] BUG AssetAdmin filter array indices (fixes #8014) --- code/controllers/AssetAdmin.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index 5269c64d..b2029230 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -120,11 +120,13 @@ JS // Category filter if(isset($params['AppCategory'])) { - $exts = File::$app_categories[$params['AppCategory']]; + $exts = (isset(File::$app_categories[$params['AppCategory']])) ? File::$app_categories[$params['AppCategory']] : array(); $categorySQLs = array(); foreach($exts as $ext) $categorySQLs[] = '"File"."Name" LIKE \'%.' . $ext . '\''; // TODO Use DataList->filterAny() once OR connectives are implemented properly - $list = $list->where('(' . implode(' OR ', $categorySQLs) . ')'); + if (count($categorySQLs) > 0) { + $list = $list->where('(' . implode(' OR ', $categorySQLs) . ')'); + } } return $list;