From 780aca0b766d10b6cb49bc37b0ce5161dc1bce0f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 May 2020 11:13:57 +0200 Subject: [PATCH 1/2] fix checking return value of hook 'addFolderAttributes' --- views/bootstrap/class.EditFolder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php index e7bc756df..5e99be9ae 100644 --- a/views/bootstrap/class.EditFolder.php +++ b/views/bootstrap/class.EditFolder.php @@ -129,7 +129,7 @@ $(document).ready(function() { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1]); } - } elseif(is_string($arr)) { + } elseif(is_string($arrs)) { echo $arr; } $this->formSubmit(" ".getMLText('save')); From 2d97c204a84655d52dffc1f576c6a0dd1474ff14 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 May 2020 20:54:34 +0200 Subject: [PATCH 2/2] determine SEEDDMS_HOME if not explicitly set --- utils/seeddms-schedulercli | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/seeddms-schedulercli b/utils/seeddms-schedulercli index 34bc8b219..f6f192a1e 100755 --- a/utils/seeddms-schedulercli +++ b/utils/seeddms-schedulercli @@ -1,6 +1,9 @@ #!/bin/sh if [ -z ${SEEDDMS_HOME+x} ]; then - echo "Please set SEEDDMS_HOME before running this script"; - exit 1; + parentdir=$(dirname "$0") + export SEEDDMS_HOME=$(dirname "$parentdir") +# echo "Setting SEEDDMS_HOME to:" $SEEDDMS_HOME +# echo "Please set SEEDDMS_HOME before running this script"; +# exit 1; fi php -f ${SEEDDMS_HOME}/utils/schedulercli.php -- "$@"