Stable merged into unstable again (due to failure on binary file during previous...

[fa-stable.git] / reporting / includes / excel_report.inc

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 996d290c42338960b9c7794f0ac69009f06401bc..7d1379b43676d9bb45929b6173ac95cfed7ad060 100644 (file)
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -693,7 +693,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                return ($px / $unit_offset_length);
        }       
 
-       function End($email=0, $subject=null, $myrow=null, $doctype = 0)
+       function End($email=0, $subject='')
        {
                ++$this->y;
                for ($i = 0; $i < $this->numcols; $i++)
@@ -714,7 +714,8 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                        }
                        closedir($d);
                }
-               meta_forward($_SERVER['PHP_SELF'], "xls=1&filename=$this->filename&unique=$this->unique_name");
+
+               meta_forward($path_to_root.'/reporting/prn_redirect.php', "xls=1&filename=$this->filename&unique=$this->unique_name");
                exit();
        }
 }