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 <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2017-04-18 08:44:24 +02:00
parent 4f662c773d
commit 15501972bc

View file

@ -313,7 +313,10 @@ class AurJSON {
} }
if ($this->version >= 2 && ($type == 'info' || $type == 'multiinfo')) { 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) { if ($this->version < 3) {