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

I think I got the apps include order corrected this time

Browse Source
This commit is contained in:
seek3r 2000-12-26 19:30:51 +00:00
parent c8ed443755
commit 28140d4b6c
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/phpgw.inc.php
View File

@ -429,7 +429,7 @@
include($phpgw_info["server"]["app_inc"]."/functions.inc.php");
}
if (! $phpgw_info["flags"]["noappheader"] && file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) {
if (! $phpgw_info["flags"]["noheader"] && $phpgw_info["flags"]["noappheader"] && file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) {
include($phpgw_info["server"]["app_inc"]."/header.inc.php");
}
}

13
phpgwapi/inc/phpgw_common.inc.php
View File

@ -574,15 +574,12 @@
* Load the app include files if the exists *
\**************************************************************************/
/* Then the include file */
/*
if (! $phpgw_info["flags"]["nonavbar"] && file_exists ($phpgw_info["server"]["app_inc"]."/functions.inc.php")){
include($phpgw_info["server"]["app_inc"]."/functions.inc.php");
}
}
if (! $phpgw_info["flags"]["noappnavbar"] && file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) {
include($phpgw_info["server"]["app_inc"]."/header.inc.php");
}
*/
function app_header() {
if (file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) {
include($phpgw_info["server"]["app_inc"]."/header.inc.php");
}
}
function phpgw_header() {