diff --git a/module/admin/config.php b/module/admin/config.php index 11f2d2c8f1..315eb9e194 100644 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -8,3 +8,7 @@ $config->url->faq = 'http://www.zentao.net/ask-faq.html'; $config->url->extension = 'http://www.zentao.net/extension-browse.html'; $config->url->donation = 'http://www.zentao.net/help-donation.html'; $config->url->service = 'http://www.cnezsoft.com/article-browse-1078.html'; + +$config->admin->flow2Ext['onlyTest'] = 'zentaotest'; +$config->admin->flow2Ext['onlyTask'] = 'zentaotask'; +$config->admin->flow2Ext['onlyStory'] = 'zentaostory'; diff --git a/module/admin/control.php b/module/admin/control.php index d7cb88527f..7a45946140 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -199,7 +199,7 @@ class admin extends control if($_POST) { $this->loadModel('setting')->setItem('system.common.global.flow', $this->post->flow, 0); - if($this->post->flow != 'full') die(js::locate($this->createLink('extension', 'install', "extension={$this->config->index->flow2Ext[$this->post->flow]}"), 'parent')); + if($this->post->flow != 'full') die(js::locate($this->createLink('extension', 'install', "extension={$this->config->admin->flow2Ext[$this->post->flow]}"), 'parent')); die(js::reload( 'parent.parent')); } $this->display(); diff --git a/module/extension/view/install.html.php b/module/extension/view/install.html.php index b32c929b59..6742e9aaa8 100644 --- a/module/extension/view/install.html.php +++ b/module/extension/view/install.html.php @@ -14,7 +14,7 @@ diff --git a/module/index/config.php b/module/index/config.php deleted file mode 100644 index 61ffbb388a..0000000000 --- a/module/index/config.php +++ /dev/null @@ -1,4 +0,0 @@ -index->flow2Ext['onlyTest'] = 'zentaotest'; -$config->index->flow2Ext['onlyTask'] = 'zentaotask'; -$config->index->flow2Ext['onlyStory'] = 'zentaostory';
title; +echo $title; if(isset($license) and $upgrade == 'yes') printf($lang->extension->upgradeVersion, $this->post->installedVersion, $this->post->upgradeVersion); ?>