From 28140d4b6c46e89c18b79f359fbaa7b3716fc60f Mon Sep 17 00:00:00 2001
From: seek3r <seek3r@alumni.egroupware.org>
Date: Tue, 26 Dec 2000 19:30:51 +0000
Subject: [PATCH] I think I got the apps include order corrected this time

---
 phpgwapi/inc/phpgw.inc.php        |  2 +-
 phpgwapi/inc/phpgw_common.inc.php | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/phpgwapi/inc/phpgw.inc.php b/phpgwapi/inc/phpgw.inc.php
index abb6673b70..186bca7a9b 100644
--- a/phpgwapi/inc/phpgw.inc.php
+++ b/phpgwapi/inc/phpgw.inc.php
@@ -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");
      }
   }
diff --git a/phpgwapi/inc/phpgw_common.inc.php b/phpgwapi/inc/phpgw_common.inc.php
index 407287c74a..79f1d44c3e 100644
--- a/phpgwapi/inc/phpgw_common.inc.php
+++ b/phpgwapi/inc/phpgw_common.inc.php
@@ -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() {