From 0ff905c924f7c0d1518c76c841867dab46d4f50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Carretero?=
<frederic.carretero@veremes.com>
Date: Wed, 21 Nov 2018 11:17:58 +0100
Subject: [PATCH] Corrections
---
vas/rest/class/vmlib/phpUtil.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/vas/rest/class/vmlib/phpUtil.inc b/vas/rest/class/vmlib/phpUtil.inc
index be016ed8..da5dbcaa 100755
--- a/vas/rest/class/vmlib/phpUtil.inc
+++ b/vas/rest/class/vmlib/phpUtil.inc
@@ -1720,9 +1720,11 @@ function isDirInWsDataDir($sModule, $sObject, $mId, $sDirectoryName = '') {
*@param $sFileName Name of the file to read.
*@return true or false.
*/
-function fileExistsInWsDataDir($sModule, $sObject, $mId, $sDirectory = '', $sFileName) {
+function fileExistsInWsDataDir($sModule, $sObject, $mId = '', $sDirectory = '', $sFileName) {
global $properties;
- $sDestDir = $properties['ws_data_dir'] . "/" . $sModule . "/" . $sObject . "/" . $mId;
+ $sDestDir = $properties['ws_data_dir'] . "/" . $sModule . "/" . $sObject;
+ if(!empty($mId))
+ $sDestDir .= "/" . $mId;
if(!empty($sDirectory))
$sDestDir .= "/" . $sDirectory;
if ($properties['fileS3Uploader'] === true) {
--
GitLab