mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-26 05:42:13 +09:00
Merge branch 'develop' of https://github.com/xpressengine/xe-core into develop
This commit is contained in:
commit
8baee45d63
2 changed files with 17 additions and 4 deletions
|
|
@ -60,16 +60,29 @@ class boardController extends board
|
|||
// check if the document is existed
|
||||
$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
|
||||
|
||||
// update the document if it is existed
|
||||
$is_update = false;
|
||||
if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
|
||||
{
|
||||
$is_update = true;
|
||||
}
|
||||
|
||||
// if use anonymous is true
|
||||
if($this->module_info->use_anonymous == 'Y')
|
||||
{
|
||||
$this->module_info->admin_mail = '';
|
||||
$obj->notify_message = 'N';
|
||||
$obj->member_srl = -1*$logged_info->member_srl;
|
||||
if($is_update===false)
|
||||
{
|
||||
$obj->member_srl = -1*$logged_info->member_srl;
|
||||
}
|
||||
$obj->email_address = $obj->homepage = $obj->user_id = '';
|
||||
$obj->user_name = $obj->nick_name = 'anonymous';
|
||||
$bAnonymous = true;
|
||||
$oDocument->add('member_srl', $obj->member_srl);
|
||||
if($is_update===false)
|
||||
{
|
||||
$oDocument->add('member_srl', $obj->member_srl);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -86,7 +99,7 @@ class boardController extends board
|
|||
}
|
||||
|
||||
// update the document if it is existed
|
||||
if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
|
||||
if($is_update)
|
||||
{
|
||||
if(!$oDocument->isGranted())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<input type="text" name="admin_id" />
|
||||
<button class="x_btn" type="button" onclick="doInsertAdmin()">{$lang->cmd_insert}</button>
|
||||
</div>
|
||||
<a href="#adminListHelp" class="x_icon-question-sign">{$lang->help}</a>
|
||||
<a href="#adminListHelp" class="x_icon-question-sign" data-toggle="#adminListHelp">{$lang->help}</a>
|
||||
<span id="adminListHelp" hidden>{$lang->about_admin_id}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue