Don't truncate HTML if content length is less than summary size (#1125)…

…, fixes #1114
getgrav · Oct 25, 2016 · cd15b91 · cd15b91
1 parent afc1823
commit cd15b91
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
@@ -507,7 +507,7 @@ public function summary($size = null)
         }
 
         $summary = Utils::truncateHTML($content, $size);
-
+		
         return html_entity_decode($summary);
     }
 

diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
@@ -188,7 +188,11 @@ public static function safeTruncate($string, $limit = 150)
      */
     public static function truncateHtml($text, $length = 100, $ellipsis = '...')
     {
-        return Truncator::truncateLetters($text, $length, $ellipsis);
+        if (mb_strlen($text) <= $length) {
+            return $text;
+        } else {
+        	return Truncator::truncateLetters($text, $length, $ellipsis);
+        }
     }
 
     /**

diff --git a/tests/unit/Grav/Common/UtilsTest.php b/tests/unit/Grav/Common/UtilsTest.php
@@ -129,6 +129,7 @@ public function testTruncateHtml()
         $this->assertEquals('<p>This is a string to truncate</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 100));
         $this->assertEquals('<input type="file" id="file" multiple>', Utils::truncateHtml('<input type="file" id="file" multiple />', 6));
         $this->assertEquals('<ol><li>item 1 <i>so...</i></li></ol>', Utils::truncateHtml('<ol><li>item 1 <i>something</i></li><li>item 2 <strong>bold</strong></li></ol>', 10));
+		$this->assertEquals("<p>This is a string.</p>\n<p>It splits two lines.</p>", Utils::truncateHtml("<p>This is a string.</p>\n<p>It splits two lines.</p>", 100));
     }
 
     public function testSafeTruncateHtml()