From 15501972bce458ad7862786311ca8264f5f34081 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Tue, 18 Apr 2017 08:44:24 +0200 Subject: Check return value of get_extended_fields() Make sure that the get_extended_fields() invocation succeeded before merging regular and extended fields in process_query(). Signed-off-by: Lukas Fleischer --- web/lib/aurjson.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'web/lib') diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index e07522d4..9eeaafde 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -313,7 +313,10 @@ class AurJSON { } if ($this->version >= 2 && ($type == 'info' || $type == 'multiinfo')) { - $row = array_merge($row, $this->get_extended_fields($row['ID'], $row['PackageBaseID'])); + $extfields = $this->get_extended_fields($row['ID'], $row['PackageBaseID']); + if ($extfields) { + $row = array_merge($row, $extfields); + } } if ($this->version < 3) { -- cgit v1.2.3-24-g4f1b