diff --git a/application/config/config.php b/application/config/config.php index b7a01bdcb..5ae5e7d32 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -545,6 +545,3 @@ $config['rewrite_short_tags'] = FALSE; | Array: array('10.0.1.200', '192.168.5.0/24') */ $config['proxy_ips'] = ''; - - - diff --git a/application/views/sales/invoice_email.php b/application/views/sales/invoice_email.php index a44033fe5..3524f1dc7 100644 --- a/application/views/sales/invoice_email.php +++ b/application/views/sales/invoice_email.php @@ -2,7 +2,7 @@
- + diff --git a/vendor/codeigniter/framework/system/libraries/Email.php b/vendor/codeigniter/framework/system/libraries/Email.php index be89d6569..f16e2f9a9 100644 --- a/vendor/codeigniter/framework/system/libraries/Email.php +++ b/vendor/codeigniter/framework/system/libraries/Email.php @@ -1469,6 +1469,7 @@ class CI_Email { .'Content-Disposition: '.$this->_attachments[$i]['disposition'].';'.$this->newline .'Content-Transfer-Encoding: base64'.$this->newline .(empty($this->_attachments[$i]['cid']) ? '' : 'Content-ID: <'.$this->_attachments[$i]['cid'].'>'.$this->newline.$this->newline) + .$this->newline .$this->_attachments[$i]['content'].$this->newline; }