summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/libraries/Email.php5
-rw-r--r--user_guide/changelog.html1
2 files changed, 4 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index e0fa689b3..aa08971f9 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1436,8 +1436,9 @@ class CI_Email {
}
$this->_send_command('data');
-
- $this->_send_data($this->_header_str . $this->_finalbody);
+
+ // perform dot transformation on any lines that begin with a dot
+ $this->_send_data($this->_header_str . preg_replace('/^\./m', '..$1', $this->_finalbody));
$this->_send_data('.');
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 131cc2a10..4945c4edc 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -137,6 +137,7 @@ SVN Commit: not currently released</p>
<li>Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.</li>
<li>Fixed a bug in the table library that could cause identically constructed rows to be dropped (#3459).</li>
<li>Fixed a bug (#4206) in the Directory Helper where the directory resource was not being closed, and minor improvements.</li>
+ <li>Fixed a bug where SMTP emails were not having dot transformation performed on lines that begin with a dot.</li>
</ul>
<h2>Version 1.6.1</h2>