summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Email.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index ee3d76367..b0d9f1269 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1162,7 +1162,10 @@ class CI_Email {
// Reduce multiple spaces
$str = preg_replace("| +|", " ", $str);
-
+
+ // kill nulls
+ $str = preg_replace('/\x00+/', '', $str);
+
// Standardize newlines
if (strpos($str, "\r") !== FALSE)
{