From 9602746cab1c1655646633b67d38b2b1c03e690a Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 24 Dec 2018 14:48:00 +0800 Subject: [PATCH] * replace zentao-integrated. --- xuanxuan/module/entry/ext/control/visit.php | 6 ++++-- .../www/data/xuanxuan/zentao-integrated.zip | Bin 97878 -> 98290 bytes 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xuanxuan/module/entry/ext/control/visit.php b/xuanxuan/module/entry/ext/control/visit.php index f8a69b3a7b..7b0470bb08 100644 --- a/xuanxuan/module/entry/ext/control/visit.php +++ b/xuanxuan/module/entry/ext/control/visit.php @@ -58,8 +58,10 @@ class entry extends control $user->ip = $this->session->clientIP->IP; $xxInstalled = $user->account . 'installed'; - if(!isset($this->config->xxclient->$xxInstalled)) $this->loadModel('setting')->setItem("system.common.xxclient.{$user->account}installed", '1'); - if(!isset($this->config->xxserver->installed)) $this->loadModel('setting')->setItem("system.common.xxserver.installed", '1'); + $this->loadModel('setting'); + if(!isset($this->config->xxclient->$xxInstalled)) $this->setting->setItem("system.common.xxclient.{$user->account}installed", '1'); + if(!isset($this->config->xxserver->installed)) $this->setting->setItem("system.common.xxserver.installed", '1'); + if(!isset($this->config->xxserver->noticed)) $this->setting->setItem("system.common.xxserver.noticed", '1'); $this->session->set('user', $user); $this->app->user = $this->session->user; diff --git a/xuanxuan/www/data/xuanxuan/zentao-integrated.zip b/xuanxuan/www/data/xuanxuan/zentao-integrated.zip index 1e354b71a23dce166fe5df451c381cf0bdb13474..8b5c269dc69699d43d6c4c4ea60f86bd9b75b262 100644 GIT binary patch delta 4532 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 DMxRsx delta 4144 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