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

This commit is contained in:
Uwe Steinmann 2017-02-28 09:19:11 +01:00
commit c32a2e7f53

View File

@ -823,7 +823,7 @@ class SeedDMS_Core_DMS {
// Only search if the offset is not beyond the number of folders // Only search if the offset is not beyond the number of folders
if($totalFolders > $offset) { if($totalFolders > $offset) {
// Prepare the complete search query, including the LIMIT clause. // Prepare the complete search query, including the LIMIT clause.
$searchQuery = "SELECT DISTINCT `tblFolders`.* ".$searchQuery." GROUP BY `tblFolders`.`id`"; $searchQuery = "SELECT DISTINCT `tblFolders`.`id` ".$searchQuery." GROUP BY `tblFolders`.`id`";
if($limit) { if($limit) {
$searchQuery .= " LIMIT ".$limit." OFFSET ".$offset; $searchQuery .= " LIMIT ".$limit." OFFSET ".$offset;