From 347619b0d2b329091d7ec69511a58c15dfa818d0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 15 Mar 2006 06:43:26 +0000 Subject: [PATCH] fixed a view double displays of the navbar --- calendar/inc/class.uiholiday.inc.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/calendar/inc/class.uiholiday.inc.php b/calendar/inc/class.uiholiday.inc.php index a0353c6fe7..db7269b4a5 100755 --- a/calendar/inc/class.uiholiday.inc.php +++ b/calendar/inc/class.uiholiday.inc.php @@ -399,15 +399,7 @@ function delete_locale() { - if(!$this->bo->total) - { - $this->admin(); - } - - unset($GLOBALS['egw_info']['flags']['noheader']); - unset($GLOBALS['egw_info']['flags']['nonavbar']); - $GLOBALS['egw_info']['flags']['noappfooter'] = True; - $GLOBALS['egw']->common->egw_header(); + $this->admin(); $p =& CreateObject('phpgwapi.Template',$this->template_dir); $p->set_file(Array('form'=>'delete_common.tpl','form_button'=>'form_button_script.tpl')); @@ -441,7 +433,7 @@ if(!$holiday) { - $this->edit_locale(); + return $this->edit_locale(); } unset($GLOBALS['egw_info']['flags']['noheader']); @@ -479,7 +471,7 @@ { if(!@$this->bo->locales[0]) { - $this->admin(); + return $this->admin(); } $this->bo->year = 0; // for a complete list with all years $holidays = $this->bo->get_holiday_list();