From 5ec47edcfccc09648e8ecf5ada68db79c214400c Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 2 Jan 2019 16:34:27 +0800
Subject: [PATCH 1/2]  * fix error.

---
 module/upgrade/model.php | 2 ++
 1 file changed, 2 insertions(+)

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|';
 

From 4d38384b4148315d07bad2361970c7d945ff5d93 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 3 Jan 2019 09:25:37 +0800
Subject: [PATCH 2/2]  * finish task #7228.

---
 module/file/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;