commit dbcd12d48024fc70a464e96f9e90bf1f341d0a11
author Andrey Andreev <narf@devilix.net> Thu Feb 13 03:04:07 2014 +0200
committer Andrey Andreev <narf@devilix.net> Thu Feb 13 03:04:07 2014 +0200
tree a4ce0c245265129e456daa0bcfd33f459521cc7b
parent 3fd1b384273b7b6d56950bbad3e1fac18f5f82e4
parent 2c30bd72b46cfdd36878273c5a8d843c7e056d42

Merge pull request #2610 from mjnaderi/patch-1

character_limiter now works correct for UTF-8 strings

system/helpers/text_helper.php

diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php
index 206ce55..45e8ae7 100644
--- a/system/helpers/text_helper.php
+++ b/system/helpers/text_helper.php
@@ -85,7 +85,7 @@
 	 */
 	function character_limiter($str, $n = 500, $end_char = '…')
 	{
-		if (strlen($str) < $n)
+		if (mb_strlen($str) < $n)
 		{
 			return $str;
 		}
@@ -93,7 +93,7 @@
 		// a bit complicated, but faster than preg_replace with \s+
 		$str = preg_replace('/ {2,}/', ' ', str_replace(array("\r", "\n", "\t", "\x0B", "\x0C"), ' ', $str));
 
-		if (strlen($str) <= $n)
+		if (mb_strlen($str) <= $n)
 		{
 			return $str;
 		}
@@ -103,10 +103,10 @@
 		{
 			$out .= $val.' ';
 
-			if (strlen($out) >= $n)
+			if (mb_strlen($out) >= $n)
 			{
 				$out = trim($out);
-				return (strlen($out) === strlen($str)) ? $out : $out.$end_char;
+				return (mb_strlen($out) === mb_strlen($str)) ? $out : $out.$end_char;
 			}
 		}
 	}