diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-04-11 14:45:35 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-04-11 14:45:35 +0000 |
| commit | 730d79fdca85c66b260bbc3f996c471fa1fcc1e7 (patch) | |
| tree | e11f87d63d37a7690ab3b1e2c3a35446237e6f4d /modules | |
| parent | 9207df11bf97fcf340c81661a2f8314fc6314db5 (diff) | |
| download | webtrees-730d79fdca85c66b260bbc3f996c471fa1fcc1e7.tar.gz webtrees-730d79fdca85c66b260bbc3f996c471fa1fcc1e7.tar.bz2 webtrees-730d79fdca85c66b260bbc3f996c471fa1fcc1e7.zip | |
Minor tidy up.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/all_tab/pgv_module.php | 5 | ||||
| -rw-r--r-- | modules/googlemap/pgv_module.php | 5 | ||||
| -rw-r--r-- | modules/lightbox/pgv_module.php | 7 |
3 files changed, 5 insertions, 12 deletions
diff --git a/modules/all_tab/pgv_module.php b/modules/all_tab/pgv_module.php index 05a35518e6..8d3f3c4def 100644 --- a/modules/all_tab/pgv_module.php +++ b/modules/all_tab/pgv_module.php @@ -81,12 +81,11 @@ class all_tab_WT_Module extends WT_Module implements WT_Module_Tab { // Implement WT_Module_Tab public function getJSCallback() { - $out = 'if (selectedTab=="all_tab") { - '; + $out = 'if (selectedTab=="'.$this->getName().'") {'; $i = 0; foreach($this->controller->modules as $mod) { if ($mod instanceof WT_Module_Tab) { - if ($i>0 && $mod->getName()!='all_tab' && $mod->canLoadAjax()) { + if ($i>0 && $mod->getName()!=$this->getName() && $mod->canLoadAjax()) { $out .= 'if (!tabCache["'.$mod->getName().'"]) { jQuery("#'.$mod->getName().'").load("individual.php?action=ajax&module='.$mod->getName().'&pid='.$this->controller->pid.'"); tabCache["'.$mod->getName().'"] = true; diff --git a/modules/googlemap/pgv_module.php b/modules/googlemap/pgv_module.php index d3bf8aa9c1..460dec236b 100644 --- a/modules/googlemap/pgv_module.php +++ b/modules/googlemap/pgv_module.php @@ -58,12 +58,9 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu // Implement WT_Module_Tab public function getPreLoadContent() { - $out = ''; ob_start(); setup_map(); - $out.=ob_get_contents(); - ob_end_clean(); - return $out; + return ob_get_clean(); } // Implement WT_Module_Tab diff --git a/modules/lightbox/pgv_module.php b/modules/lightbox/pgv_module.php index 14431216cf..53f17b8513 100644 --- a/modules/lightbox/pgv_module.php +++ b/modules/lightbox/pgv_module.php @@ -105,12 +105,9 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul // Implement WT_Module_Tab public function getPreLoadContent() { - $out = ''; ob_start(); - include_once('modules/lightbox/functions/lb_call_js.php'); - $out .= ob_get_contents(); - ob_end_clean(); - return $out; + require_once WT_ROOT.'modules/lightbox/functions/lb_call_js.php'; + return ob_get_clean(); } // Implement WT_Module_Tab |