Menu hotkeys system implementation.

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

diff --git a/includes/page/header.inc b/includes/page/header.inc
index 931616f1a7a38a07b1ef1c8298577af5e7d11f8f..2ab707cc55e9d14419c6dcfd6d4312e8d56db0ed 100644 (file)
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -17,7 +17,7 @@ function help_url($title, $app)
        }
        elseif ($title==_("Main Menu"))
        {
-               $help_page_url = $applications[$app];
+               $help_page_url = access_string($applications[$app], true);
        }
        else
        {
@@ -93,7 +93,9 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
                $sel_app = $_SESSION["sel_app"];
        else
                $sel_app = $def_app;
-       $_SESSION["App"]->selected_application = $_SESSION["sel_app"] = $sel_app;
+       $_SESSION["sel_app"] = $sel_app;
+       if (isset($_SESSION["App"]) && is_object($_SESSION["App"]))
+               $_SESSION["App"]->selected_application = $sel_app;
        $encoding = $_SESSION['language']->encoding;
 
        if (!headers_sent()){