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

corrected a problem with the order we include app header and app functions

Browse Source
This commit is contained in:
seek3r 2000-12-26 18:55:58 +00:00
parent 53dfb62915
commit 680b766dbb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,7 +417,7 @@
/**************************************************************************\ /**************************************************************************\
* Load the header unless the developer turns it off * * Load the header unless the developer turns it off *
\**************************************************************************/ \**************************************************************************/
if (!isset($phpgw_info["flags"]["noheader"]) || ! $phpgw_info["flags"]["noheader"]) { if (! $phpgw_info["flags"]["noheader"]) {
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();
} }
@ -425,7 +425,7 @@
* Load the app include files if the exists * * Load the app include files if the exists *
\**************************************************************************/ \**************************************************************************/
/* Then the include file */ /* Then the include file */
if (file_exists ($phpgw_info["server"]["app_inc"]."/functions.inc.php")){ if ($phpgw_info["flags"]["nonavbar"] && file_exists ($phpgw_info["server"]["app_inc"]."/functions.inc.php")){
include($phpgw_info["server"]["app_inc"]."/functions.inc.php"); include($phpgw_info["server"]["app_inc"]."/functions.inc.php");
} }
} }

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

@ -574,6 +574,10 @@
* Load the app include files if the exists * * Load the app include files if the exists *
\**************************************************************************/ \**************************************************************************/
/* Then the include file */ /* 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 (file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) { if (file_exists ($phpgw_info["server"]["app_inc"]."/header.inc.php")) {
include($phpgw_info["server"]["app_inc"]."/header.inc.php"); include($phpgw_info["server"]["app_inc"]."/header.inc.php");
} }