diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php index d2850d93ad6c54983e1809a0d4246284cd24e561..6af34b7f0cfe60feac92f96f5673466ac11aed08 100755 --- a/src/app/folder/controllers/FolderController.php +++ b/src/app/folder/controllers/FolderController.php @@ -571,7 +571,7 @@ class FolderController } $folder = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $aArgs['id'], 'edition' => true]); - + DatabaseModel::beginTransaction(); $deletion = FolderController::folderDeletion(['folderId' => $aArgs['id']]); if (!$deletion) { @@ -688,7 +688,7 @@ class FolderController $allQueryData = ResourceListController::getResourcesListQueryData(['data' => $queryParams]); if (!empty($allQueryData['order'])) { - $data['order'] = $allQueryData['order']; + $queryParams['order'] = $allQueryData['order']; } $rawResources = ResourceListModel::getOnView([ @@ -697,7 +697,7 @@ class FolderController 'leftJoin' => $allQueryData['leftJoin'], 'where' => array_merge(['res_id in (?)'], $allQueryData['where']), 'data' => array_merge([$foldersResources], $allQueryData['queryData']), - 'orderBy' => empty($data['order']) ? ['creation_date'] : [$data['order']] + 'orderBy' => empty($queryParams['order']) ? ['creation_date'] : [$queryParams['order']] ]); $resIds = ResourceListController::getIdsWithOffsetAndLimit(['resources' => $rawResources, 'offset' => $queryParams['offset'], 'limit' => $queryParams['limit']]);