adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #288. TextHelper truncation not playing nice with html in ending.

Browse source
This commit is contained in:
predominant 2010-02-02 09:13:52 +11:00
parent be7ddfb972
commit 8d382d9168
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/view/helpers/text.php
View file

@ -168,7 +168,7 @@ class TextHelper extends AppHelper {
if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
return $text;
}
$totalLength = mb_strlen($ending);
$totalLength = mb_strlen(strip_tags($ending));
$openTags = array();
$truncate = '';
preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
@ -210,7 +210,6 @@ class TextHelper extends AppHelper {
break;
}
}
} else {
if (mb_strlen($text) <= $length) {
return $text;

4
cake/tests/cases/libs/view/helpers/text.test.php
View file

@ -100,7 +100,9 @@ class TextHelperTest extends CakeTestCase {
$this->assertIdentical($this->Text->{$m}($text7, 255), $text7);
$this->assertIdentical($this->Text->{$m}($text7, 15), 'El moño está...');
$this->assertIdentical($this->Text->{$m}($text8, 15), 'Vive la R'.chr(195).chr(169).'pu...');
$this->assertIdentical($this->Text->{$m}($text1, 25, 'Read more'), 'The quick brown Read more');
$this->assertIdentical($this->Text->{$m}($text1, 25, '<a href="http://www.google.com/">Read more</a>', true, true), 'The quick brown <a href="http://www.google.com/">Read more</a>');
if ($this->method == 'truncate') {
$this->method = 'trim';
$this->testTruncate();