summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-09-21 02:45:12 +0200
committeradmin <devnull@localhost>2006-09-21 02:45:12 +0200
commitd16d6c2055f119a4df9812548ed13449f6c806f9 (patch)
treecb90d761d0f39b607e4161dd4eb82ce258f9360c /system
parentec5a5a69d5e5a7e6f0c3c097ef5b7f72103fd426 (diff)
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Email.php14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index abc77a54d..5b991d1fa 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -130,7 +130,7 @@ class CI_Email {
* @access public
* @return void
*/
- function clear()
+ function clear($clear_attachments = FALSE)
{
$this->_subject = "";
$this->_body = "";
@@ -143,6 +143,13 @@ class CI_Email {
$this->_set_header('User-Agent', $this->useragent);
$this->_set_header('Date', $this->_set_date());
+
+ if ($clear_attachments !== FALSE)
+ {
+ $this->_attach_name = array();
+ $this->_attach_type = array();
+ $this->_attach_disp = array();
+ }
}
// END clear()
@@ -735,6 +742,11 @@ class CI_Email {
*/
function _get_alt_message()
{
+ if ($this->alt_message != "")
+ {
+ return $this->word_wrap($this->alt_message, '76');
+ }
+
if (eregi( '\<body(.*)\</body\>', $this->_body, $match))
{
$body = $match['1'];