fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 07:12:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-09-29 00:23:30 +09:00
commit 177a6c6b7d
42 changed files with 98 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/comment/comment.item.php
View file

@ -446,7 +446,7 @@ class commentItem extends BaseObject
{
$member_srl = 0;
}
$content = vsprintf('<!--BeforeComment(%d,%d)--><div class="comment_%d_%d xe_content%s">%s</div><!--AfterComment(%d,%d)-->', array(
$content = vsprintf('<!--BeforeComment(%d,%d)--><div class="comment_%d_%d rhymix_content xe_content%s">%s</div><!--AfterComment(%d,%d)-->', array(
$this->comment_srl, $member_srl, $this->comment_srl, $member_srl, $additional_class, $content, $this->comment_srl, $member_srl
));
}
@ -454,7 +454,7 @@ class commentItem extends BaseObject
{
if($add_xe_content_class)
{
$content = sprintf('<div class="xe_content%s">%s</div>', $additional_class, $content);
$content = sprintf('<div class="rhymix_content xe_content%s">%s</div>', $additional_class, $content);
}
}

2
modules/comment/comment.model.php
View file

@ -48,7 +48,7 @@ class commentModel extends comment
$columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress');
$oComment = self::getComment($comment_srl, FALSE, $columnList);
$module_srl = $oComment->get('module_srl');
$member_srl = $oComment->get('member_srl');
$member_srl = abs($oComment->get('member_srl'));
$comment_config = ModuleModel::getModulePartConfig('document', $module_srl);

8
modules/comment/queries/getTotalCommentList.xml
View file

@ -4,7 +4,13 @@
<table name="documents" />
</tables>
<columns>
<column name="*" />
<column name="comments.*" />
<column name="documents.module_srl" alias="module_srl" />
<column name="documents.member_srl" alias="document_member_srl" />
<column name="documents.user_id" alias="document_user_id" />
<column name="documents.user_name" alias="document_user_name" />
<column name="documents.nick_name" alias="document_nick_name" />
<column name="documents.title" alias="document_title" />
</columns>
<conditions>
<condition operation="equal" column="documents.document_srl" var="comments.document_srl" notnull="notnull" />