From 4d293786bd369ac5040cabfd0a8a582f94656d5c Mon Sep 17 00:00:00 2001 From: fisharebest Date: Tue, 6 Apr 2010 19:11:46 +0000 Subject: Start to refactor module code. Administration and initialisation. NOTE: changes to DB structure. --- includes/controllers/individual_ctrl.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'includes/controllers') diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php index bc728d8d1b..9bedefbc5e 100644 --- a/includes/controllers/individual_ctrl.php +++ b/includes/controllers/individual_ctrl.php @@ -253,19 +253,16 @@ class IndividualControllerRoot extends BaseController { */ } - $this->modules = WT_Module::getActiveList('T'); - uasort($this->modules, "WT_Module::compare_tab_order"); + $this->modules = WT_Module::getActiveTabs(); $count = 0; if (empty($this->default_tab)) $this->default_tab=0; foreach($this->modules as $mod) { - if ($mod instanceof WT_Module_Tab) { - $mod->setController($this); - if ($mod->hasTabContent() || WT_USER_CAN_EDIT) { - //-- convert default tab as name to number - if ($mod->getName()===$this->default_tab) $this->default_tab = $count; - if ($this->static_tab==null) $this->static_tab = $mod; - else $count++; - } + $mod->setController($this); + if ($mod->hasTabContent() || WT_USER_CAN_EDIT) { + //-- convert default tab as name to number + if ($mod->getName()===$this->default_tab) $this->default_tab = $count; + if ($this->static_tab==null) $this->static_tab = $mod; + else $count++; } } if ($this->default_tab<0 || $this->default_tab > count($this->modules)-1) $this->default_tab=0; -- cgit v1.3