[aur-dev] [PATCH 2/3] Refactor pkgbase_comments_count()

[Lukas Fleischer]

Signed-off-by: Lukas Fleischer <archlinux at cryptocrack.de>
---
 web/lib/pkgbasefuncs.inc.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index 91db229..39aed0f 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -24,28 +24,26 @@ function pkgbase_categories() {
 /**
  * Get the number of non-deleted comments for a specific package base
  *
- * @param string $pkgid The package base ID to get comment count for
+ * @param string $base_id The package base ID to get comment count for
  *
  * @return string The number of comments left for a specific package
  */
 function pkgbase_comments_count($base_id) {
-	$dbh = DB::connect();
-
 	$base_id = intval($base_id);
-	if ($base_id > 0) {
-		$dbh = DB::connect();
-		$q = "SELECT COUNT(*) FROM PackageComments ";
-		$q.= "WHERE PackageBaseID = " . $base_id;
-		$q.= " AND DelUsersID IS NULL";
+	if (!$base_id) {
+		return null;
 	}
-	$result = $dbh->query($q);
 
+	$dbh = DB::connect();
+	$q = "SELECT COUNT(*) FROM PackageComments ";
+	$q.= "WHERE PackageBaseID = " . $base_id . " ";
+	$q.= "AND DelUsersID IS NULL";
+	$result = $dbh->query($q);
 	if (!$result) {
-		return;
+		return null;
 	}
 
-	$row = $result->fetch(PDO::FETCH_NUM);
-	return $row[0];
+	return $result->fetchColumn(0);
 }
 
 /**
-- 
1.9.1