From 8d16356f756795f8d881ff8305e2a1ec83c47069 Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 25 Oct 2009 20:09:28 +0000 Subject: [PATCH] remove unreachable code git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@426 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/Service/Vote.php | 21 ++++----------------- tests/VoteTest.php | 2 +- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/SemanticScuttle/Service/Vote.php b/src/SemanticScuttle/Service/Vote.php index 086b2a2..7adf549 100644 --- a/src/SemanticScuttle/Service/Vote.php +++ b/src/SemanticScuttle/Service/Vote.php @@ -34,9 +34,6 @@ */ class SemanticScuttle_Service_Vote extends SemanticScuttle_DbService { - - - /** * Returns the single service instance * @@ -98,10 +95,6 @@ class SemanticScuttle_Service_Vote extends SemanticScuttle_DbService $row = $this->db->sql_fetchrow($dbres); $this->db->sql_freeresult($dbres); - if (!$row) { - return false; - } - return (int)$row['sum']; }//public function getVoting(..) @@ -117,7 +110,8 @@ class SemanticScuttle_Service_Vote extends SemanticScuttle_DbService */ public function getVotes($bookmark) { - $query = 'SELECT COUNT(vote) as count FROM ' . $this->getTableName() + $query = 'SELECT COUNT(vote) as count FROM ' + . $this->getTableName() . ' WHERE bid = "' . $this->db->sql_escape($bookmark) . '"'; if (!($dbres = $this->db->sql_query_limit($query, 1, 0))) { @@ -132,10 +126,6 @@ class SemanticScuttle_Service_Vote extends SemanticScuttle_DbService $row = $this->db->sql_fetchrow($dbres); $this->db->sql_freeresult($dbres); - if (!$row) { - return false; - } - return (int)$row['count']; } @@ -152,7 +142,8 @@ class SemanticScuttle_Service_Vote extends SemanticScuttle_DbService */ public function hasVoted($bookmark, $user) { - $query = 'SELECT COUNT(vote) as count FROM ' . $this->getTableName() + $query = 'SELECT COUNT(vote) as count FROM ' + . $this->getTableName() . ' WHERE' . ' bid = "' . $this->db->sql_escape($bookmark) . '"' . ' AND uid = "' . $this->db->sql_escape($user) . '"'; @@ -169,10 +160,6 @@ class SemanticScuttle_Service_Vote extends SemanticScuttle_DbService $row = $this->db->sql_fetchrow($dbres); $this->db->sql_freeresult($dbres); - if (!$row) { - return null; - } - return (int)$row['count'] == 1; } diff --git a/tests/VoteTest.php b/tests/VoteTest.php index 90611d1..754d908 100644 --- a/tests/VoteTest.php +++ b/tests/VoteTest.php @@ -147,7 +147,7 @@ class VoteTest extends TestBase /** - * Test getVoting() when several votes have been cast. + * Test getVotes() when several votes have been cast. * * @return void */