Merge pull request #221 from thinkclay/3.3/develop

Fixes #4450
kohana · Feb 17, 2012 · 0055c46 · 0055c46
2 parents c5c45ac + 26b90db
commit 0055c46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/classes/Kohana/Text.php b/classes/Kohana/Text.php
@@ -60,7 +60,7 @@ class Kohana_Text {
 	public static function limit_words($str, $limit = 100, $end_char = NULL)
 	{
 		$limit = (int) $limit;
-		$end_char = ($end_char === NULL) ? '…' : $end_char;
+		$end_char = ($end_char === NULL) ? '...' : $end_char;
 
 		if (trim($str) === '')
 			return $str;
@@ -89,7 +89,7 @@ public static function limit_words($str, $limit = 100, $end_char = NULL)
 	 */
 	public static function limit_chars($str, $limit = 100, $end_char = NULL, $preserve_words = FALSE)
 	{
-		$end_char = ($end_char === NULL) ? '…' : $end_char;
+		$end_char = ($end_char === NULL) ? '...' : $end_char;
 
 		$limit = (int) $limit;
 

diff --git a/tests/kohana/TextTest.php b/tests/kohana/TextTest.php
@@ -112,8 +112,8 @@ function provider_limit_words()
 		return array
 		(
 			array('', '', 100, NULL),
-			array('…', 'The rain in spain', -10, NULL),
-			array('The rain…', 'The rain in spain', 2, NULL),
+			array('...', 'The rain in spain', -10, NULL),
+			array('The rain...', 'The rain in spain', 2, NULL),
 			array('The rain...', 'The rain in spain', 2, '...'),
 		);
 	}
@@ -138,12 +138,12 @@ function provider_limit_chars()
 		return array
 		(
 			array('', '', 100, NULL, FALSE),
-			array('…', 'BOO!', -42, NULL, FALSE),
-			array('making php bet…', 'making php better for the sane', 14, NULL, FALSE),
+			array('...', 'BOO!', -42, NULL, FALSE),
+			array('making php bet...', 'making php better for the sane', 14, NULL, FALSE),
 			array('Garçon! Un café s.v.p.', 'Garçon! Un café s.v.p.', 50, '__', FALSE),
 			array('Garçon!__', 'Garçon! Un café s.v.p.', 8, '__', FALSE),
 			// @issue 3238
-			array('making php…', 'making php better for the sane', 14, NULL, TRUE),
+			array('making php...', 'making php better for the sane', 14, NULL, TRUE),
 			array('Garçon!__', 'Garçon! Un café s.v.p.', 9, '__', TRUE),
 			array('Garçon!__', 'Garçon! Un café s.v.p.', 7, '__', TRUE),
 			array('__', 'Garçon! Un café s.v.p.', 5, '__', TRUE),