From 23a61dd68d73877358a34ee3b7e28ee27aa58088 Mon Sep 17 00:00:00 2001
From: lebozec <nicolas.lebozec@xelians.fr>
Date: Mon, 7 Aug 2023 18:09:58 +0200
Subject: [PATCH] FIX #26209 TIME 0:05 Code correction
---
src/app/folder/controllers/FolderController.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index d2850d93ad6..6af34b7f0cf 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']]);
--
GitLab