Small cleanup

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

index b0364cbebcec0e19c6c94ae187dfe13ea768455c..10cc8b103ab31d7297a6408b5b001205118ebc96 100644 (file)
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -47,13 +47,12 @@ function help_url($context=null)
  
  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));
@@ -84,7 +83,6 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
  //             add_js_ufile($jsext);
  
         $theme = user_theme();
-       $local_path_to_root = $path_to_root;
  
         if ($help_base_url != null && $use_popup_windows && $js == '')
         {
@@ -127,7 +125,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>";
         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";
+       echo "<link href='$path_to_root/themes/$theme/default.css' rel='stylesheet' type='text/css'> \n";
         send_scripts($js);
  
         echo "</head> \n";
@@ -135,7 +133,8 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
                 echo "<body>";
         else
                 echo "<body onload=\"$onload\">";
-       include_once($local_path_to_root."/themes/".user_theme()."/renderer.php");
+
+       include_once($path_to_root . "/themes/".user_theme()."/renderer.php");
         $rend = new renderer();
         $rend->menu_header($title, $no_menu, $is_index);
         error_box();