adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-07 03:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tag order when closing open tags with TextHelper::truncate()

Browse source
This commit is contained in:
Kyle Robinson Young 2011-12-25 09:10:50 -08:00
parent 4e7e06fa9f
commit acca796d10
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
View file

@ -129,7 +129,7 @@ Steve/era/distinto/elpepueconeg/20111009elpneglse_4/Tes</a></span></p>
Steve Jobs escrita por Walter Isaacson "<strong>Steve Jobs by Walter
Isaacson</strong>", aquí os dejamos la dirección de amazon donde
podeís adquirirla.</span></p>
<p><span style="font-size: medium;"><a>... </p></span></a>';
<p><span style="font-size: medium;"><a>... </a></span></p>';
$this->assertEquals($expected, $result);
}

6
lib/Cake/View/Helper/TextHelper.php
View file

@ -287,11 +287,17 @@ class TextHelper extends AppHelper {
$bits = mb_substr($truncate, $spacepos);
preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER);
if (!empty($droppedTags)) {
if (!empty($openTags)) {
foreach ($droppedTags as $closingTag) {
if (!in_array($closingTag[1], $openTags)) {
array_unshift($openTags, $closingTag[1]);
}
}
} else {
foreach ($droppedTags as $closingTag) {
array_push($openTags, $closingTag[1]);
}
}
}
}
$truncate = mb_substr($truncate, 0, $spacepos);