diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 3a538aec4..823837a83 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -423,11 +423,11 @@ class Sales extends Secure_Controller $html = $this->load->view('sales/invoice_email', $sale_data, TRUE); // load pdf helper $this->load->helper(array('dompdf', 'file')); - $file_content = pdf_create($html, '', FALSE); $filename = sys_get_temp_dir() . '/' . $this->lang->line('sales_invoice') . '-' . str_replace('/', '-' , $sale_data['invoice_number']) . '.pdf'; - write_file($filename, $file_content); - - $result = $this->email_lib->sendEmail($to, $subject, $text, $filename); + if(file_put_contents($filename, pdf_create($html)) !== FALSE) + { + $result = $this->email_lib->sendEmail($to, $subject, $text, $filename); + } $message = $this->lang->line($result ? 'sales_invoice_sent' : 'sales_invoice_unsent') . ' ' . $to; } diff --git a/application/helpers/dompdf_helper.php b/application/helpers/dompdf_helper.php index 0940d1b91..e88a69a07 100644 --- a/application/helpers/dompdf_helper.php +++ b/application/helpers/dompdf_helper.php @@ -1,23 +1,27 @@ loadHtml($html); $dompdf->render(); - ini_set("magic_quotes_runtime", $magic_quotes_enabled); - - if ($stream) + if(!$magic_quotes_enabled) { - $dompdf->stream($filename.".pdf"); + ini_set('magic_quotes_runtime', $magic_quotes_enabled); + } + + if($filename != '') + { + $dompdf->stream($filename . '.pdf'); } else {