Removed obsolete $tabs global array, tab ids retrieved from $_SESSION['App']

[fa-stable.git] / includes / page / header.inc

diff --git a/includes/page/header.inc b/includes/page/header.inc
index 8b1b36e2f4c338a62221994767ebd562ed1ff14a..65003be49eb533b62f2a61c7a44ecf83a3624f7c 100644 (file)
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -102,8 +102,13 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
        else
                $sel_app = user_startup_tab();
        $_SESSION["sel_app"] = $sel_app;
+
+       // When startup tab for current user was set to already 
+       // removed/inactivated extension module select Sales tab as default.
        if (isset($_SESSION["App"]) && is_object($_SESSION["App"]))
-               $_SESSION["App"]->selected_application = $sel_app;
+               $_SESSION["App"]->selected_application = 
+                       isset($_SESSION["App"]->applications[$sel_app]) ? $sel_app : 'orders';
+                       
        $encoding = $_SESSION['language']->encoding;
 
        if (!headers_sent()){