From eb4365a5c08003286cd3f765635fb3d931d3b19e Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Wed, 6 Jan 2016 22:03:50 +0000 Subject: [PATCH] fix bug count --- lib/php/db/table.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/php/db/table.php b/lib/php/db/table.php index bd688701..a19eb134 100644 --- 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()); -- 2.47.3