X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=6d6fbdb88016478344569b79cbcfaf62a356fd84;hb=3613e32ad573d5faccb974a421702bdd87583878;hp=bb8fbd3102c07f94789ec95fae215d906f3be766;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/includes/page/header.inc b/includes/page/header.inc
index bb8fbd31..6d6fbdb8 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -40,18 +40,19 @@ function help_url($context=null)
 	if ($clean)
 		$help_page_url = access_string($help_page_url, true);
 
-	return $help_base_url.urlencode(str_replace(' ', '', ucwords($help_page_url))).'&lang='.$country;
+	return $help_base_url
+		.urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
+		.'&ctxhelp=1&lang='.$country;
 }
 
 function send_scripts()
 {
-    global $js_lib, $js_static, $js_path, $js_userlib, $comp_path,
-	$path_to_root, $go_debug;
+    global $js_lib, $js_static, $js_path, $js_userlib, $path_to_root, $go_debug;
 
 	$js ='';
 	foreach($js_static as $jsfile)
 	{
-	    $fpath = $comp_path.'/'.user_company().'/js_cache/'.$jsfile;
+	    $fpath = company_path().'/js_cache/'.$jsfile;
 	    // compress also static files
 	  	if (!file_exists($fpath) || $go_debug)
 			cache_js_file($fpath, file_get_contents($js_path.$jsfile));
@@ -99,8 +100,8 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
 	{
 		$no_menu = false;
 	}
-	if (!isset($_SESSION["sel_app"]))
-		session_register("sel_app");
+	//if (!isset($_SESSION["sel_app"]))
+	//	session_register("sel_app");
 	if (isset($_SESSION["App"]) && is_object($_SESSION["App"]) && isset($_SESSION["App"]->selected_application) &&
 		$_SESSION["App"]->selected_application != "")
 		$sel_app = $_SESSION["App"]->selected_application;