4.48 release

kalcaddle · May 17, 2022 · d555b05 · d555b05
1 parent d3871a7
commit d555b05
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 42 deletions.
diff --git a/app/controller/utils.php b/app/controller/utils.php
diff --git a/app/function/helper.function.php b/app/function/helper.function.php
@@ -425,7 +425,7 @@ function user_logout(){
 
 	$url = './index.php?user/login';
 	//之前界面维持，不是主动退出则登陆后跳转到之前页面
-	if(ACT != 'logout' && count($_GET)!=0 ){
+	if(defined('ACT') && ACT != 'logout' && count($_GET)!=0 ){
 		$url .= '&link='.rawurlencode(this_url());
 	}
 	//移动端；接口请求时退出

diff --git a/config/version.php b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 define('KOD_VERSION','4.48');
-define('KOD_VERSION_BUILD','01');//time(),20220516
+define('KOD_VERSION_BUILD','02');//time(),20220516
diff --git a/plugins/toolsCommon/static/pie/.pie.tif b/plugins/toolsCommon/static/pie/.pie.tif
diff --git a/static/js/app/src/api/default/main.js b/static/js/app/src/api/default/main.js
diff --git a/static/js/app/src/api/view/main.js b/static/js/app/src/api/view/main.js
diff --git a/static/js/app/src/app/main.js b/static/js/app/src/app/main.js
diff --git a/static/js/app/src/desktop/main.js b/static/js/app/src/desktop/main.js
diff --git a/static/js/app/src/edit/main.js b/static/js/app/src/edit/main.js
diff --git a/static/js/app/src/editor/main.js b/static/js/app/src/editor/main.js
diff --git a/static/js/app/src/explorer/main.js b/static/js/app/src/explorer/main.js
diff --git a/static/js/app/src/explorerWap/main.js b/static/js/app/src/explorerWap/main.js
diff --git a/static/js/app/src/plugins/main.js b/static/js/app/src/plugins/main.js
diff --git a/static/js/app/src/setting/main.js b/static/js/app/src/setting/main.js
diff --git a/static/js/app/src/shareEditor/main.js b/static/js/app/src/shareEditor/main.js
diff --git a/static/js/app/src/shareExplorer/main.js b/static/js/app/src/shareExplorer/main.js
diff --git a/static/js/app/src/shareIndex/main.js b/static/js/app/src/shareIndex/main.js
diff --git a/static/js/app/src/user/main.js b/static/js/app/src/user/main.js
diff --git a/static/style/skin/base/app_code_edit.css b/static/style/skin/base/app_code_edit.css
diff --git a/static/style/skin/base/app_desktop.css b/static/style/skin/base/app_desktop.css
diff --git a/static/style/skin/base/app_editor.css b/static/style/skin/base/app_editor.css
diff --git a/static/style/skin/base/app_explorer.css b/static/style/skin/base/app_explorer.css
diff --git a/static/style/skin/base/app_setting.css b/static/style/skin/base/app_setting.css