holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed navbar showing up twice when using frames and calling phpgw_header() manually

Browse Source
This commit is contained in:
jengo 2000-12-18 21:33:02 +00:00
parent 96791d2cad
commit 3a1c8acfbb
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -50,7 +50,7 @@
} }
if ($navbarframe) { if ($navbarframe) {
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();
$phpgw->common->navbar(); $phpgw->common->navbar(True);
} }
} else { } else {
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();

10
phpgwapi/phpgw_common.inc.php
View File

@ -294,9 +294,17 @@
} }
} }
function navbar() function navbar($force = False)
{ {
global $cd,$phpgw,$phpgw_info,$colspan,$PHP_SELF; global $cd,$phpgw,$phpgw_info,$colspan,$PHP_SELF;
if (($phpgw_info["user"]["preferences"]["common"]["useframes"] && $phpgw_info["server"]["useframes"] == "allowed")
|| ($phpgw_info["server"]["useframes"] == "always")) {
if (! $force) {
return False;
}
}
$tpl = new Template($phpgw_info["server"]["template_dir"]); $tpl = new Template($phpgw_info["server"]["template_dir"]);
$tpl->set_file(array("navbar" => "navbar.tpl", $tpl->set_file(array("navbar" => "navbar.tpl",
"navbar_row" => "navbar_row.tpl", "navbar_row" => "navbar_row.tpl",