fix user-specific tags
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@435 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
parent
1ea488babe
commit
10f59ea771
1 changed files with 12 additions and 10 deletions
|
@ -527,6 +527,18 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
|
||||||
$query_5.= ' GROUP BY B.bHash';
|
$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) {
|
switch($sortOrder) {
|
||||||
case 'date_asc':
|
case 'date_asc':
|
||||||
$query_5.= ' ORDER BY B.bModified 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 .'"';
|
$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;
|
$query = $query_1 . $query_2 . $query_3 . $query_4 . $query_5;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue