[aur-dev] [PATCH 5/8] Simplify canDeleteComment()

Lukas Fleischer archlinux at cryptocrack.de
Thu Feb 6 13:42:16 EST 2014


Use COUNT(*) instead of COUNT(ID) and PDO::FETCH_NUM instead of
PDO::FETCH_ASSOC. This also includes some minor formatting fixes.

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

diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 05be21c..59cc975 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -22,19 +22,19 @@ function canDeleteComment($comment_id=0, $atype="", $uid=0) {
 		/* TUs and developers can delete any comment. */
 		return true;
 	}
+
 	$dbh = DB::connect();
-	$q = "SELECT COUNT(ID) AS CNT ";
-	$q.= "FROM PackageComments ";
-	$q.= "WHERE ID = " . intval($comment_id);
-	$q.= " AND UsersID = " . $uid;
+
+	$q = "SELECT COUNT(*) FROM PackageComments ";
+	$q.= "WHERE ID = " . intval($comment_id) . " AND UsersID = " . $uid;
 	$result = $dbh->query($q);
-	if ($result != NULL) {
-		$row = $result->fetch(PDO::FETCH_ASSOC);
-		if ($row['CNT'] > 0) {
-			return true;
-		}
+
+	if (!$result) {
+		return false;
 	}
-	return false;
+
+	$row = $result->fetch(PDO::FETCH_NUM);
+	return ($row[0] > 0);
 }
 
 /**
-- 
1.8.5.3



More information about the aur-dev mailing list