diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index 00237d50a..d08369569 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -422,11 +422,8 @@ class commentItem extends Object // Convert temporarily html entity for truncate $content = html_entity_decode($content, ENT_QUOTES); - // Replace unicode whitespace characters (no-break space) - $content = utf8_normalize_spaces($content); - // Replace all whitespaces to single space - $content = trim(preg_replace('/\s+/', ' ', $content)); + $content = utf8_trim(utf8_normalize_spaces($content)); // Truncate string $content = cut_str($content, $str_size, $tail); diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 4a3ced603..466b203d1 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -639,11 +639,8 @@ class documentItem extends Object // Convert temporarily html entity for truncate $content = html_entity_decode($content, ENT_QUOTES); - // Replace unicode whitespace characters (no-break space) - $content = utf8_normalize_spaces($content); - // Replace all whitespaces to single space - $content = trim(preg_replace('/\s+/', ' ', $content)); + $content = utf8_trim(utf8_normalize_spaces($content)); // Truncate string $content = cut_str($content, $str_size, $tail); diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php index ddd3e0c73..5687df931 100644 --- a/widgets/content/content.class.php +++ b/widgets/content/content.class.php @@ -453,11 +453,8 @@ class content extends WidgetHandler // Convert temporarily html entity for truncate $content = html_entity_decode($content, ENT_QUOTES); - // Replace unicode whitespace characters (no-break space) - $content = utf8_normalize_spaces($content); - // Replace all whitespaces to single space - $content = trim(preg_replace('/\s+/', ' ', $content)); + $content = utf8_trim(utf8_normalize_spaces($content)); // Truncate string $content = cut_str($content, $str_size, '...'); diff --git a/widgets/mcontent/mcontent.class.php b/widgets/mcontent/mcontent.class.php index 07cefa416..bdbd6117c 100644 --- a/widgets/mcontent/mcontent.class.php +++ b/widgets/mcontent/mcontent.class.php @@ -385,19 +385,15 @@ class mcontent extends WidgetHandler // Convert temporarily html entity for truncate $content = html_entity_decode($content, ENT_QUOTES); - // Replace unicode whitespace characters (no-break space) - $content = utf8_normalize_spaces($content); - // Replace all whitespaces to single space - $content = trim(preg_replace('/\s+/', ' ', $content)); + $content = utf8_trim(utf8_normalize_spaces($content)); // Truncate string $content = cut_str($content, $str_size, '...'); return escape($content); } - - + /** * @brief function to receive contents from rss url * For Tistory blog in Korea, the original RSS url has location header without contents. Fixed to work as same as rss_reader widget.