Menu hotkeys system implementation.

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

index 893527e88f1823edac73a5a7217bbc2c762fcc9f..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
         {
@@ -94,6 +94,8 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
         else
                 $sel_app = $def_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()){
@@ -103,7 +105,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
         echo "<html dir='" . $_SESSION['language']->dir . "' >\n";
         echo "<head><title>$title</title>";
         $local_stylesheet = $_SESSION['language']->get_stylesheet();
-       echo "<meta http-equiv='Content-type' content='text/html' charset='$encoding'>";
+       echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding'>";
         echo "<link href='$local_path_to_root/themes/$theme/default.css' rel='stylesheet' type='text/css'> \n";
         if (file_exists($local_path_to_root. "/".$local_stylesheet))
                 echo "<link href='$local_path_to_root/$local_stylesheet' rel='stylesheet' type='text/css'> \n";