projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allowed space and square brackets in button names
[fa-stable.git]
/
includes
/
page
/
header.inc
diff --git
a/includes/page/header.inc
b/includes/page/header.inc
index 9bff3d2f391710be748f72f5b3e34a86c18eb367..6d6fbdb88016478344569b79cbcfaf62a356fd84 100644
(file)
--- a/
includes/page/header.inc
+++ b/
includes/page/header.inc
@@
-47,13
+47,12
@@
function help_url($context=null)
function send_scripts()
{
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)
{
$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));
// compress also static files
if (!file_exists($fpath) || $go_debug)
cache_js_file($fpath, file_get_contents($js_path.$jsfile));
@@
-101,8
+100,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;