diff --git a/lib/Cake/Test/Case/Utility/StringTest.php b/lib/Cake/Test/Case/Utility/StringTest.php index 27bf9c34a..3072078fb 100644 --- a/lib/Cake/Test/Case/Utility/StringTest.php +++ b/lib/Cake/Test/Case/Utility/StringTest.php @@ -372,6 +372,7 @@ TEXT; $text9 = 'НОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыь'; $text10 = 'http://example.com/something/foo:bar'; + $elipsis = "\xe2\x80\xa6"; $this->assertSame($this->Text->truncate($text1, 15), 'The quick br...'); $this->assertSame($this->Text->truncate($text1, 15, array('exact' => false)), 'The quick...'); $this->assertSame($this->Text->truncate($text1, 100), 'The quick brown fox jumps over the lazy dog'); @@ -380,17 +381,17 @@ TEXT; $this->assertSame($this->Text->truncate($text3, 20), '© 2005-20...'); $this->assertSame($this->Text->truncate($text4, 15), ' This image ta' . chr(226)); - $this->assertSame($this->Text->truncate($text4, 45, array('html' => true)), ' This image tag is not XHTML conform!

But the' . chr(226) . ''); - $this->assertSame($this->Text->truncate($text4, 90, array('html' => true)), ' This image tag is not XHTML conform!

But the following image tag should be conform Me, myself and I
Great,' . chr(226)); + $this->assertSame($this->Text->truncate($text1, 15, array('html' => true)), 'The quick brow' . $elipsis); + $this->assertSame($this->Text->truncate($text1, 15, array('exact' => false, 'html' => true)), 'The quick' . $elipsis); + $this->assertSame($this->Text->truncate($text2, 10, array('html' => true)), 'Heizölrüc' . $elipsis); + $this->assertSame($this->Text->truncate($text2, 10, array('exact' => false, 'html' => true)), $elipsis); + $this->assertSame($this->Text->truncate($text3, 20, array('html' => true)), '© 2005-2007, Cake S' . $elipsis . ''); + $this->assertSame($this->Text->truncate($text4, 15, array('html' => true)), ' This image ta' . $elipsis); + $this->assertSame($this->Text->truncate($text4, 45, array('html' => true)), ' This image tag is not XHTML conform!

But the' . $elipsis . ''); + $this->assertSame($this->Text->truncate($text4, 90, array('html' => true)), ' This image tag is not XHTML conform!

But the following image tag should be conform Me, myself and I
Great,' . $elipsis); $this->assertSame($this->Text->truncate($text5, 6, array('ellipsis' => '', 'html' => true)), '012345'); $this->assertSame($this->Text->truncate($text5, 20, array('ellipsis' => '', 'html' => true)), $text5); - $this->assertSame($this->Text->truncate($text6, 57, array('exact' => false, 'html' => true)), "

Extra dates have been announced for this year's" . chr(226) . "

"); + $this->assertSame($this->Text->truncate($text6, 57, array('exact' => false, 'html' => true)), "

Extra dates have been announced for this year's" . $elipsis . "

"); $this->assertSame($this->Text->truncate($text7, 255), $text7); $this->assertSame($this->Text->truncate($text7, 15), 'El moño está...'); $this->assertSame($this->Text->truncate($text8, 15), 'Vive la R' . chr(195) . chr(169) . 'pu...'); diff --git a/lib/Cake/Utility/String.php b/lib/Cake/Utility/String.php index f372d62e8..1b18f323e 100644 --- a/lib/Cake/Utility/String.php +++ b/lib/Cake/Utility/String.php @@ -479,7 +479,7 @@ class String { if (isset($options['ending'])) { $default['ellipsis'] = $options['ending']; } elseif (!empty($options['html']) && Configure::read('App.encoding') == 'UTF-8') { - $default['ellipsis'] = "\xE2\x80\xA6"; + $default['ellipsis'] = "\xe2\x80\xa6"; } $options = array_merge($default, $options); extract($options);