Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

This commit is contained in:
Uwe Steinmann 2017-02-28 09:10:27 +01:00
commit 5cf7611304

View File

@ -826,7 +826,7 @@ class SeedDMS_Core_DMS {
$searchQuery = "SELECT DISTINCT `tblFolders`.* ".$searchQuery." GROUP BY `tblFolders`.`id`"; $searchQuery = "SELECT DISTINCT `tblFolders`.* ".$searchQuery." GROUP BY `tblFolders`.`id`";
if($limit) { if($limit) {
$searchQuery .= " LIMIT ".$offset.",".$limit; $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;
} }
// Send the complete search query to the database. // Send the complete search query to the database.
@ -1058,7 +1058,7 @@ class SeedDMS_Core_DMS {
else else
$offset = 0; $offset = 0;
if($limit) if($limit)
$searchQuery .= " LIMIT ".$offset.",".$remain; $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;
// Send the complete search query to the database. // Send the complete search query to the database.
$resArr = $this->db->getResultArray($searchQuery); $resArr = $this->db->getResultArray($searchQuery);