mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-21 02:18:28 +02:00
I think I got the apps include order corrected this time
This commit is contained in:
parent
c8ed443755
commit
28140d4b6c
@ -429,7 +429,7 @@
|
|||||||
include($phpgw_info["server"]["app_inc"]."/functions.inc.php");
|
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");
|
include($phpgw_info["server"]["app_inc"]."/header.inc.php");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -574,15 +574,12 @@
|
|||||||
* 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 (! $phpgw_info["flags"]["noappnavbar"] && file_exists ($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");
|
include($phpgw_info["server"]["app_inc"]."/header.inc.php");
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function phpgw_header() {
|
function phpgw_header() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user