From cc57e117c9c871f0cd426ac51e37279e82cf9652 Mon Sep 17 00:00:00 2001 From: Johnny Date: Sat, 30 Mar 2024 14:48:20 +0900 Subject: [PATCH] =?UTF-8?q?c229839f2b09ee98f002c45631dc6b2aa3b75e9b=20?= =?UTF-8?q?=EB=B3=B4=EC=99=84=20=EC=8A=A4=ED=82=A8=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=ED=95=98=EC=A7=80=20=EC=95=8A=EA=B3=A0=20com?= =?UTF-8?q?mentItem=20=EC=97=90=EC=84=9C=20=EC=B2=98=EB=A6=AC=20=ED=95=98?= =?UTF-8?q?=EA=B3=A0=20=EA=B8=B0=EB=B3=B8=20=EB=A9=94=EC=84=B8=EC=A7=80=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/comment/comment.item.php | 32 ++++++++++++++++--- .../member/m.skins/default/comment_list.html | 2 +- .../member/skins/default/comment_list.html | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index cee1bb7f3..fae860265 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -440,7 +440,7 @@ class CommentItem extends BaseObject return false; } - function getContentPlainText($strlen = 0) + function getContentPlainText($strlen = 0, $default_content = '') { if($this->isDeletedByAdmin()) { @@ -465,7 +465,20 @@ class CommentItem extends BaseObject { $content = cut_str($content, $strlen, '...'); } - return escape($content); + + $content = escape($content); + + if ($content === '') + { + return $default_content; + } + + if ($content === '0') + { + return '0'; + } + + return $content; } /** @@ -563,7 +576,7 @@ class CommentItem extends BaseObject * Return summary content * @return string */ - function getSummary($str_size = 50, $tail = '...') + function getSummary($str_size = 50, $tail = '...', $default_content = '') { // Remove tags $content = $this->getContent(false, false); @@ -578,8 +591,19 @@ class CommentItem extends BaseObject // Truncate string $content = cut_str($content, $str_size, $tail); + $content = escape($content); - return escape($content); + if ($content === '') + { + return $default_content; + } + + if ($content === '0') + { + return '0'; + } + + return $content; } function getRegdate($format = 'Y.m.d H:i:s', $conversion = true) diff --git a/modules/member/m.skins/default/comment_list.html b/modules/member/m.skins/default/comment_list.html index 025e6ad86..b0006258c 100644 --- a/modules/member/m.skins/default/comment_list.html +++ b/modules/member/m.skins/default/comment_list.html @@ -4,7 +4,7 @@