fix bug count

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index bd688701180a7ede0c449abc4333f07235ae4485..a19eb13429bc025b08b21d3d18f6d31608bbbe48 100644 (file)
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -636,11 +636,11 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog.
     if ($select_count) {
       $query = $this->db->conn->query('SELECT FOUND_ROWS()');
 
-# NB 06.01.16     } elseif ($where) {
-# NB 06.01.16       $sql_count = $sql;
-# NB 06.01.16       $sql_count = preg_replace('/ (ORDER|LIMIT) .*?$/s','',$sql_count);
-# NB 06.01.16       $sql_count = preg_replace('/^SELECT .*FROM/s','SELECT count(*) FROM ',$sql_count);
-# NB 06.01.16       $query = $this->db->conn->query($sql_count);
+    } elseif ($where) {
+      $sql_count = $sql;
+      $sql_count = preg_replace('/ (ORDER|LIMIT) .*?$/s','',$sql_count);
+      $sql_count = preg_replace('/^SELECT .*FROM/s','SELECT count(*) FROM ',$sql_count);
+      $query = $this->db->conn->query($sql_count);
 
     } else {
       $query = $this->db->conn->query('SELECT count(*) FROM '.$this->sql_name());