diff --git a/db/update4.2.sql b/db/update4.2.sql index 8ab3e051f6..77b04c362d 100644 --- a/db/update4.2.sql +++ b/db/update4.2.sql @@ -1,2 +1,3 @@ ALTER TABLE `zt_extension` ADD `depends` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `installedTime` ; ALTER TABLE `zt_extension` CHANGE `zentaoVersion` `zentaoCompatible` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; +ALTER TABLE `zt_company` DROP `pms`; diff --git a/module/install/control.php b/module/install/control.php index e30816d330..c9da94b521 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -96,7 +96,6 @@ class install extends control $this->view->app = $this->app; $this->view->lang = $this->lang; $this->view->config = $this->config; - $this->view->domain = $this->server->HTTP_HOST; $this->view->title = $this->lang->install->saveConfig; $this->view->mysqldump = $this->install->getMySQLDump(); $this->display(); @@ -142,7 +141,6 @@ class install extends control } else { - $this->view->pmsDomain = $this->server->HTTP_HOST; $this->display(); } } diff --git a/module/install/model.php b/module/install/model.php index 504f2af921..8ccc20e70c 100644 --- a/module/install/model.php +++ b/module/install/model.php @@ -390,9 +390,8 @@ class installModel extends model /* Insert a company. */ $company = new stdclass(); $company->name = $this->post->company; - $company->pms = $this->post->pms; $company->admins = ",{$this->post->account},"; - $this->dao->insert(TABLE_COMPANY)->data($company)->autoCheck()->batchCheck('name, pms', 'notempty')->check('pms', 'unique')->exec(); + $this->dao->insert(TABLE_COMPANY)->data($company)->autoCheck()->batchCheck('name', 'notempty')->exec(); if(!dao::isError()) { diff --git a/module/install/view/step3.html.php b/module/install/view/step3.html.php index ece90a7992..e915e9a0fc 100644 --- a/module/install/view/step3.html.php +++ b/module/install/view/step3.html.php @@ -25,7 +25,6 @@ if(!isset($error)) \$config->db->password = '$dbPassword'; \$config->db->prefix = '$dbPrefix'; \$config->webRoot = getWebRoot(); -\$config->default->domain = '$domain'; \$config->default->lang = '$defaultLang'; \$config->mysqldump = '$mysqldump'; EOT; diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php index d039484ee8..24940e2323 100644 --- a/module/install/view/step4.html.php +++ b/module/install/view/step4.html.php @@ -31,10 +31,6 @@ install->company;?> - - install->pms;?> - {$lang->install->pmsNote}";?> - install->account;?>