projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging changes form main trunk 2.2.5-2.2.6
[fa-stable.git]
/
includes
/
page
/
header.inc
diff --git
a/includes/page/header.inc
b/includes/page/header.inc
index bb8fbd3102c07f94789ec95fae215d906f3be766..b0364cbebcec0e19c6c94ae187dfe13ea768455c 100644
(file)
--- a/
includes/page/header.inc
+++ b/
includes/page/header.inc
@@
-40,7
+40,9
@@
function help_url($context=null)
if ($clean)
$help_page_url = access_string($help_page_url, true);
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()
}
function send_scripts()
@@
-99,8
+101,8
@@
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
{
$no_menu = false;
}
{
$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;
if (isset($_SESSION["App"]) && is_object($_SESSION["App"]) && isset($_SESSION["App"]->selected_application) &&
$_SESSION["App"]->selected_application != "")
$sel_app = $_SESSION["App"]->selected_application;