From 5d9776b7348f6467f73436b87da86adee2202cad Mon Sep 17 00:00:00 2001
From: popcorner <351633+popcorner@user.noreply.gitee.com>
Date: Sun, 30 Aug 2020 21:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20GBK=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=8B=E5=90=8E=E5=8F=B0=E9=A6=96=E9=A1=B5=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF=E4=B9=B1?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/admincp/admincp_index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upload/source/admincp/admincp_index.php b/upload/source/admincp/admincp_index.php
index bf56c2b34..ef3bac355 100644
--- a/upload/source/admincp/admincp_index.php
+++ b/upload/source/admincp/admincp_index.php
@@ -117,12 +117,12 @@ cpheader();
 shownav();
 
 require_once libfile('function/cloudaddons');
-$newversion = dunserialize($_G['setting']['cloudaddons_newversion']);
+$newversion = (CHARSET == 'utf-8') ? dunserialize($_G['setting']['cloudaddons_newversion']) : json_decode($_G['setting']['cloudaddons_newversion'],true);
 if(empty($newversion['newversion']) || !is_array($newversion['newversion']) || abs($_G['timestamp'] - $newversion['updatetime']) > 86400 || (isset($_GET['checknewversion']) && $_G['formhash'] == $_GET['formhash'])) {
 	$newversion = json_decode(cloudaddons_open('&mod=app&ac=upgrade'), true);
 	if(!empty($newversion['newversion'])){
 		$newversion['updatetime'] = $_G['timestamp'];
-		C::t('common_setting')->update('cloudaddons_newversion', $newversion);
+		C::t('common_setting')->update('cloudaddons_newversion', ((CHARSET == 'utf-8') ? $newversion : json_encode($newversion)));
 		updatecache('setting');
 	}else{
 		$newversion = array();
-- 
Gitee