fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into template-v2

Browse source
This commit is contained in:
Kijin Sung 2023-10-18 20:45:28 +09:00
commit 977a61fb6e
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -969,6 +969,8 @@ class CommentController extends Comment
$obj->homepage = $obj->homepage ?? $source_obj->get('homepage');
}
if(($obj->is_secret ?? 'N') !== 'Y') $obj->is_secret = 'N';
if(($obj->notify_message ?? 'N') !== 'Y') $obj->notify_message = 'N';
$obj->uploaded_count = FileModel::getFilesCount($obj->comment_srl);
// call a trigger (before)

8
modules/document/document.controller.php
View file

@ -924,6 +924,11 @@ class DocumentController extends Document
$obj->ipaddress = $source_obj->get('ipaddress');
}
if(!isset($obj->is_notice)) $obj->is_notice = 'N';
if(($obj->title_bold ?? 'N') !== 'Y') $obj->title_bold = 'N';
if(($obj->title_color ?? 'N') === 'N') $obj->title_color = 'N';
if(($obj->notify_message ?? 'N') !== 'Y') $obj->notify_message = 'N';
if(($obj->allow_trackback ?? 'N') !== 'Y') $obj->allow_trackback = 'N';
$obj->uploaded_count = FileModel::getFilesCount($obj->document_srl);
// Call a trigger (before)
@ -951,7 +956,6 @@ class DocumentController extends Document
if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
if($obj->homepage)
{
$obj->homepage = escape($obj->homepage);
@ -961,8 +965,6 @@ class DocumentController extends Document
}
}
if($obj->notify_message != 'Y') $obj->notify_message = 'N';
// can modify regdate only manager
$grant = Context::get('grant');
if(!$grant->manager)