Wrong column for array_substitute in delivery and invoice templates.

[fa-stable.git] / includes / main.inc

diff --git a/includes/main.inc b/includes/main.inc
index 161911c608b512b87559d7e7ff2569b21ae8427d..e6b7f9f8a48ed4b096610adc5b2e15ca19281f4e 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -46,16 +46,16 @@ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $scri
        }
 }
 
-function end_page($no_menu=false, $is_index=false, $hide_back_link=false, $type_no=0, $trans_no=0)
+function end_page($no_menu=false, $is_index=false, $final_screen=false, $type_no=0, $trans_no=0)
 {
        global $path_to_root;
 
-       if (!$is_index && !$hide_back_link && function_exists('hyperlink_back'))
-               hyperlink_back(true, $no_menu, $type_no, $trans_no);
+       if (!$is_index && function_exists('hyperlink_back'))
+               hyperlink_back(true, $no_menu, $type_no, $trans_no, $final_screen);
        div_end();      // end of _page_body section
 
        include($path_to_root . "/includes/page/footer.inc");
-       page_footer($no_menu, $is_index, $hide_back_link);
+       page_footer($no_menu, $is_index);
 }
 
 function cache_js_file($fpath, $text) 
@@ -256,9 +256,9 @@ function check_write($path)
 {
        if ($path == ''//|| $path == '.' || $path == '..'
        ) return 0;
-       
+
        return is_writable($path) ? (is_dir($path) ? 1 : -1) 
-               : (is_file($path) ? 0 : ($path == '.' ? 0 : check_write(dirname($path))));
+               : (is_file($path) ? 0 : ($path == '.' || $path == '..' ? 0 : check_write(dirname($path))));
 }
 
 /*