hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复语言检测未匹配时的错误 

优化分片上传
pull/460/MERGE
Karson 2023-12-14 17:57:38 +08:00
parent cdb41c5334
commit ae57feebb6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/common/library/Upload.php
View File

@ -305,7 +305,7 @@ class Upload
$attachment = $this->upload(); $attachment = $this->upload();
} catch (\Exception $e) { } catch (\Exception $e) {
@unlink($destFile); @unlink($uploadPath);
throw new UploadException($e->getMessage()); throw new UploadException($e->getMessage());
} }
return $attachment; return $attachment;

2
application/common/view/tpl/think_exception.tpl
View File

@ -19,7 +19,7 @@ if (isset($_GET['lang'])) {
$langSet = strtolower($_COOKIE['think_var']); $langSet = strtolower($_COOKIE['think_var']);
} elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches); preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
$langSet = strtolower($matches[1]); $langSet = strtolower($matches[1] ?? '');
} }
$langSet = $langSet && in_array($langSet, ['zh-cn', 'en']) ? $langSet : 'zh-cn'; $langSet = $langSet && in_array($langSet, ['zh-cn', 'en']) ? $langSet : 'zh-cn';
$langSet == 'en' && $lang = array_combine(array_keys($lang), array_keys($lang)); $langSet == 'en' && $lang = array_combine(array_keys($lang), array_keys($lang));