From ca54750a7e0910de8056ae9e26def594d676be4e Mon Sep 17 00:00:00 2001 From: Guillaume Heurtier <guillaume.heurtier@maarch.org> Date: Mon, 25 Nov 2019 17:25:21 +0100 Subject: [PATCH] Fix code review --- src/app/resource/controllers/ResController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index 3028efeb5bc..3310cb35ce9 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -835,7 +835,7 @@ class ResController $entities = array_column($entities, 'id'); $idToDelete = FolderModel::getWithEntitiesAndResources([ 'select' => ['resources_folders.id'], - 'where' => ['resources_folders.res_id = ?', 'entities_folders.entity_id in (?) || folders.user_id = ?'], + 'where' => ['resources_folders.res_id = ?', '(entities_folders.entity_id in (?) OR folders.user_id = ?)'], 'data' => [$args['resId'], $entities, $GLOBALS['id']] ]); $idToDelete = array_column($idToDelete, 'id'); -- GitLab