summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlakoff <vlakoff@gmail.com>2014-05-20 10:32:53 +0200
committervlakoff <vlakoff@gmail.com>2014-05-20 10:32:53 +0200
commitf0ab81362bb7732ac1a4272e950c5b6cea59bb06 (patch)
tree24b2f7ef5e980021130afcb9c0565ca35abbf997
parent0f7eba2a0b276e7a23e442b7a9786e04622acbba (diff)
Pick up some changes from text helper
-rw-r--r--system/libraries/Email.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index fc1bbe1b2..c39a26a15 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1182,7 +1182,7 @@ class CI_Email {
}
}
- // Use PHP's native public function to do the initial wordwrap.
+ // Use PHP's native function to do the initial wordwrap.
// We set the cut flag to FALSE so that any individual words that are
// too long get left alone. In the next step we'll deal with them.
$str = wordwrap($str, $charlim, "\n", FALSE);
@@ -1193,7 +1193,7 @@ class CI_Email {
{
// Is the line within the allowed character count?
// If so we'll join it to the output and continue
- if (strlen($line) <= $charlim)
+ if (mb_strlen($line) <= $charlim)
{
$output .= $line.$this->newline;
continue;
@@ -1209,10 +1209,10 @@ class CI_Email {
}
// Trim the word down
- $temp .= substr($line, 0, $charlim-1);
- $line = substr($line, $charlim-1);
+ $temp .= mb_substr($line, 0, $charlim - 1);
+ $line = mb_substr($line, $charlim - 1);
}
- while (strlen($line) > $charlim);
+ while (mb_strlen($line) > $charlim);
// If $temp contains data it means we had to split up an over-length
// word into smaller chunks so we'll add it back to our current line