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

cakephp · Dec 25, 2011 · acca796 · acca796
1 parent 4e7e06f
commit acca796
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
@@ -129,7 +129,7 @@ public function testTruncate() {
 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);
 	}
 

diff --git a/lib/Cake/View/Helper/TextHelper.php b/lib/Cake/View/Helper/TextHelper.php
@@ -287,9 +287,15 @@ class_exists('Multibyte');
 				$bits = mb_substr($truncate, $spacepos);
 				preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER);
 				if (!empty($droppedTags)) {
-					foreach ($droppedTags as $closingTag) {
-						if (!in_array($closingTag[1], $openTags)) {
-							array_unshift($openTags, $closingTag[1]);
+					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]);
 						}
 					}
 				}