diff --git a/module/file/control.php b/module/file/control.php index 5fcf453e04..0a679eefe6 100644 --- a/module/file/control.php +++ b/module/file/control.php @@ -299,7 +299,7 @@ class file extends control if(strpos($fileName, $extension) === false) $fileName .= $extension; /* urlencode the filename for ie. */ - if(strpos($this->server->http_user_agent, 'MSIE') !== false or strpos($this->server->http_user_agent, 'Trident') !== false) $fileName = urlencode($fileName); + if(strpos($this->server->http_user_agent, 'MSIE') !== false or strpos($this->server->http_user_agent, 'Trident') !== false or strpos($this->server->http_user_agent, 'Edge') !== false) $fileName = urlencode($fileName); /* Judge the content type. */ $mimes = $this->config->file->mimes; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 2377f1b0cc..d50e67aac3 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -918,6 +918,8 @@ class upgradeModel extends model */ public function execSQL($sqlFile) { + if(!file_exists($sqlFile)) return false; + $mysqlVersion = $this->loadModel('install')->getMysqlVersion(); $ignoreCode = '|1050|1060|1091|1061|';