diff options
Diffstat (limited to 'src/SemanticScuttle')
| -rw-r--r-- | src/SemanticScuttle/Service/Bookmark.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index 34a819c..3a7edd9 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -527,6 +527,18 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $query_5.= ' GROUP BY B.bHash'; } + + //Voting system + //needs to be directly after FROM bookmarks + if ($GLOBALS['enableVoting'] && $userservice->isLoggedOn()) { + $currentuser = $userservice->getCurrentUser(); + $vs = SemanticScuttle_Service_Factory::get('Vote'); + $query_1 .= ', !ISNULL(V.bId) as hasVoted, V.vote as vote'; + $query_2 .= ' LEFT JOIN ' . $vs->getTableName() . ' AS V' + . ' ON B.bId = V.bId' + . ' AND V.uId = ' . (int)$currentuser['uId']; + } + switch($sortOrder) { case 'date_asc': $query_5.= ' ORDER BY B.bModified ASC '; @@ -606,16 +618,6 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $query_4 .= ' AND B.bHash = "'. $hash .'"'; } - //Voting system - if ($GLOBALS['enableVoting'] && $userservice->isLoggedOn()) { - $currentuser = $userservice->getCurrentUser(); - $vs = SemanticScuttle_Service_Factory::get('Vote'); - $query_1 .= ', !ISNULL(V.bId) as hasVoted, V.vote as vote'; - $query_2 .= ' LEFT JOIN ' . $vs->getTableName() . ' AS V' - . ' ON B.bId = V.bId' - . ' AND V.uId = ' . (int)$currentuser['uId']; - } - $query = $query_1 . $query_2 . $query_3 . $query_4 . $query_5; |