From e6033369a8501e5fbe2473c6f068792641743996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 26 Nov 2015 20:33:07 +0100 Subject: [PATCH] Update resource.class.php --- htdocs/resource/class/resource.class.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index 3c3f0ee6e49..e42b8983c7a 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -22,7 +22,6 @@ */ -// Put here all includes required by your class file require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"; @@ -403,7 +402,13 @@ class Resource extends CommonObject } $sql.= " GROUP BY t.rowid"; $sql.= $this->db->order($sortfield,$sortorder); - if ($limit) $sql.= $this->db->plimit($limit+1,$offset); + $this->num_all = 0; + if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) + { + $result = $this->db->query($sql); + $this->num_all = $this->db->num_rows($result); + } + if ($limit) $sql.= $this->db->plimit($limit, $offset); dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG); $resql=$this->db->query($sql);