From c0044290238e247ba3facc210d736b3c0a50ce89 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sat, 5 Apr 2014 19:32:07 +0200 Subject: Refactor pkgbase_categories() Signed-off-by: Lukas Fleischer --- web/lib/pkgbasefuncs.inc.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 5be7048..c55bd89 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -9,17 +9,15 @@ include_once("config.inc.php"); * @return array All package categories */ function pkgbase_categories() { - $cats = array(); $dbh = DB::connect(); $q = "SELECT * FROM PackageCategories WHERE ID != 1 "; $q.= "ORDER BY Category ASC"; $result = $dbh->query($q); - if ($result) { - while ($row = $result->fetch(PDO::FETCH_NUM)) { - $cats[$row[0]] = $row[1]; - } + if (!$result) { + return null; } - return $cats; + + return $result->fetchAll(PDO::FETCH_KEY_PAIR); } /** -- cgit v1.2.3-70-g09d2