diff --git a/core/core.js.php b/core/core.js.php index 9abb42c6..0ab52f46 100755 --- a/core/core.js.php +++ b/core/core.js.php @@ -260,10 +260,10 @@ core.start = function() { var fileName = inputFileHiddenDOM.val(); if(fileName === "") { fileName = "Choisissez un fichier"; - $(".inputFileDelete").addClass("disabled"); + $(inputFileHiddenDOM).addClass("disabled"); } else { - $(".inputFileDelete").removeClass("disabled"); + $(inputFileHiddenDOM).removeClass("disabled"); } inputFileHiddenDOM.parent().find(".inputFileLabel").text(fileName); }).trigger("change"); diff --git a/core/core.php b/core/core.php index 2c0562c9..62cbb3cd 100755 --- a/core/core.php +++ b/core/core.php @@ -39,7 +39,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.2.00.dev28'; + const ZWII_VERSION = '10.2.00.dev30'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; @@ -1668,7 +1668,8 @@ class core extends common { */ foreach($this->getData(['user']) as $userId => $userIds){ $t = explode('/',$this->getData(['user', $userId, 'accessUrl'])); - if ( $userId !== $this->getuser('id') && + if ( $this->getuser('id') && + $userId !== $this->getuser('id') && $this->getData(['user', $userId,'accessUrl']) === $this->getUrl() && array_intersect($t,self::$accessList) && array_intersect($t,self::$accessExclude) !== false &&