(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 5197d2e94305531c99c5377c9e093eaf6f5bd7e1..7896195b2fbc8bd15f09fb37c2557b3533d07578 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -178,9 +178,16 @@ class wsDAOBook extends commonDAO {
 \r
        public function count($limitedToUserRights = false)\r
        {\r
-               $where = '(' . $this->makeWhereFromFiltres() . ')';\r
+               $filters = $this->makeWhereFromFiltres();\r
+               if ($filters == '1=1') {\r
+                       $table = 'books';\r
+               } else {\r
+                       $table = 'books_vue';\r
+               }\r
+\r
+               $where = '(' . $filters . ')';\r
                $where .= $this->limitToUserRights($limitedToUserRights);\r
-               $r = $this->con->select('SELECT COUNT(*) AS nb FROM books_vue WHERE ' . $where);\r
+               $r = $this->con->select('SELECT COUNT(*) AS nb FROM ' . $table . ' WHERE ' . $where);\r
                return $r->nb;\r
        }\r
 \r