gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-12-17 09:33:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-6.0.x' into seeddms-6.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2020-05-20 21:17:26 +02:00
commit cedf704662
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/seeddms-schedulercli
View File

@ -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 -- "$@"

2
views/bootstrap/class.EditFolder.php
View File

@ -188,7 +188,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("<i class=\"icon-save\"></i> ".getMLText('save'));