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

Merge branch 'develop' into pr/member-phone-number

Browse source
This commit is contained in:
Kijin Sung 2018-07-06 09:15:52 +09:00
commit 625c3b741f
435 changed files with 22374 additions and 21994 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/member/member.class.php
View file

@ -251,6 +251,15 @@ class member extends ModuleObject {
if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true;
if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) return true;
// Allow duplicate nickname
if($config->allow_duplicate_nickname == 'Y')
{
if($oDB->isIndexExists('member', 'unique_nick_name') || !$oDB->isIndexExists('member', 'idx_nick_name'))
{
return true;
}
}
return false;
}
@ -423,6 +432,19 @@ class member extends ModuleObject {
$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'))
$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
// Allow duplicate nickname
if($config->allow_duplicate_nickname == 'Y')
{
if($oDB->isIndexExists('member', 'unique_nick_name'))
{
$oDB->dropIndex('member', 'unique_nick_name', true);
}
if(!$oDB->isIndexExists('member', 'idx_nick_name'))
{
$oDB->addIndex('member', 'idx_nick_name', array('nick_name'));
}
}
}
/**