summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-03-13 10:11:26 +0000
committermensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-03-13 10:11:26 +0000
commit7884e0e33bf6e9502f0b193b33074e9b62563cc0 (patch)
tree483fce128868bd4a85a29bbac212aeac8623866a
parent9de80c6d84b10b918c575ec123d5c94d63827268 (diff)
downloadsemanticscuttle-7884e0e33bf6e9502f0b193b33074e9b62563cc0.tar.gz
semanticscuttle-7884e0e33bf6e9502f0b193b33074e9b62563cc0.tar.bz2
Bug fix: correct counting result for history page
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@78 b3834d28-1941-0410-a4f8-b48e95affb8f
-rw-r--r--services/bookmarkservice.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/services/bookmarkservice.php b/services/bookmarkservice.php
index b5ce452..54c2773 100644
--- a/services/bookmarkservice.php
+++ b/services/bookmarkservice.php
@@ -370,7 +370,11 @@ class BookmarkService {
if (SQL_LAYER == 'mysql4') {
$totalquery = 'SELECT FOUND_ROWS() AS total';
} else {
- $totalquery = 'SELECT COUNT(DISTINCT bAddress) AS total'. $query_2 . $query_3 . $query_4;
+ if ($hash) {
+ $totalquery = 'SELECT COUNT(*) AS total'. $query_2 . $query_3 . $query_4;
+ } else {
+ $totalquery = 'SELECT COUNT(DISTINCT bAddress) AS total'. $query_2 . $query_3 . $query_4;
+ }
}
if (!($totalresult = & $this->db->sql_query($totalquery)) || (!($row = & $this->db->sql_fetchrow($totalresult)))) {