diff --git a/db/update18.3.sql b/db/update18.3.sql index e38ee5094c..556b852aa2 100644 --- a/db/update18.3.sql +++ b/db/update18.3.sql @@ -440,6 +440,9 @@ ALTER TABLE `zt_meetingroom` CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '', CHANGE `editedDate` `editedDate` datetime NULL; +ALTER TABLE `zt_module` +CHANGE `short` `short` varchar(30) NOT NULL DEFAULT ''; + ALTER TABLE `zt_mr` CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '', CHANGE `editedDate` `editedDate` datetime NULL; diff --git a/db/zentao.sql b/db/zentao.sql index b319782f82..1f4a6f1784 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1097,7 +1097,7 @@ CREATE TABLE IF NOT EXISTS `zt_module` ( `from` mediumint(8) unsigned NOT NULL default '0', `owner` varchar(30) NOT NULL, `collector` text NOT NULL, - `short` varchar(30) NOT NULL, + `short` varchar(30) NOT NULL DEFAULT '', `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), KEY `root` (`root`), diff --git a/module/cron/control.php b/module/cron/control.php index 485334be88..bf8be43f5d 100644 --- a/module/cron/control.php +++ b/module/cron/control.php @@ -34,7 +34,7 @@ class cron extends control */ public function turnon($confirm = 'no') { - $turnon = empty($this->config->global->cron) ? 1 : 0; + $turnon = empty($this->config->global->cron) ? '1' : '0'; if(!$turnon and $confirm == 'no') return print(js::confirm($this->lang->cron->confirmTurnon, inlink('turnon', "confirm=yes"))); $this->loadModel('setting')->setItem('system.common.global.cron', $turnon); return print(js::reload('parent')); diff --git a/module/install/control.php b/module/install/control.php index 3e39e044ad..211a03661a 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -264,7 +264,7 @@ class install extends control $this->setting->setItem('system.common.global.flow', $this->post->flow); $this->setting->setItem('system.common.safe.mode', '1'); $this->setting->setItem('system.common.safe.changeWeak', '1'); - $this->setting->setItem('system.common.global.cron', 1); + $this->setting->setItem('system.common.global.cron', '1'); $httpType = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http'; if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) and strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https') $httpType = 'https';