mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-13 21:21:27 +00:00
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
This commit is contained in:
commit
5cf7611304
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user