From e6524741fb2b6dad05bde1de7343f7f398dff747 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Tue, 3 Mar 2020 17:34:47 +0100
Subject: [PATCH] FEAT #12091 TIME 0:05 small fixes
---
src/app/resource/controllers/ResController.php | 2 +-
src/app/tag/controllers/TagController.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index e417237a5b7..a9cc5440b76 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -1241,7 +1241,7 @@ class ResController extends ResourceControlController
public function getResourceFileInformation(Request $request, Response $response, array $args)
{
- if (!ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
+ if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
}
diff --git a/src/app/tag/controllers/TagController.php b/src/app/tag/controllers/TagController.php
index abeab457b16..ecd4ff62324 100644
--- a/src/app/tag/controllers/TagController.php
+++ b/src/app/tag/controllers/TagController.php
@@ -71,7 +71,7 @@ class TagController
'data' => [$tag['id']]
]);
- $tag['canMerge'] = empty($tag['parent_id']) && empty($childTags[0]['count']);
+ $tag['canMerge'] = empty($tag['parent_id']) && empty($childTags);
return $response->withJson($tag);
}
--
GitLab