diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index e946a1166..3d3ddf6de 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -3149,7 +3149,7 @@ class MemberController extends Member
*
* @param bool $deprecated_allow_update_other
*/
- function updateMember($args, $deprecated_allow_update_other = FALSE)
+ function updateMember($args, $deprecated_allow_update_other = FALSE, $manual_updated = FALSE)
{
// Call a trigger (before)
$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
@@ -3175,7 +3175,7 @@ class MemberController extends Member
{
unset($args->is_admin);
unset($args->limit_date);
- unset($args->description);
+ if(!$manual_updated) unset($args->description);
if (!$deprecated_allow_update_other)
{
unset($args->denied);
@@ -3389,7 +3389,7 @@ class MemberController extends Member
if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
- if($logged_info->is_admin !== 'Y')
+ if($logged_info->is_admin !== 'Y' && !$manual_updated)
{
$args->description = $orgMemberInfo->description;
}
diff --git a/modules/ncenterlite/lang/ko.php b/modules/ncenterlite/lang/ko.php
index 80b6a69b5..1d60e27be 100644
--- a/modules/ncenterlite/lang/ko.php
+++ b/modules/ncenterlite/lang/ko.php
@@ -14,7 +14,7 @@ $lang->ncenterlite_type_scrap = '스크랩 알림';
$lang->ncenterlite_type_message = '쪽지 알림';
$lang->ncenterlite_type_test = '테스트 알림';
$lang->ncenterlite_type_admin_content = '관리자 알림';
-$lang->ncenterlite_type_custom = '기타 알림';
+$lang->ncenterlite_type_custom = '글 작성 알림';
$lang->ncenterlite_comment_noti = $lang->ncenterlite_type_comment;
$lang->ncenterlite_comment_comment_noti = $lang->ncenterlite_type_comment_comment;
$lang->ncenterlite_mention_noti = $lang->ncenterlite_type_mention;
@@ -45,7 +45,7 @@ $lang->ncenterlite_message_noti_about = '새 쪽지가 도착하면 알림을
$lang->ncenterlite_vote_noti_about = '내 글이나 댓글이 추천을 받으면 알림을 받습니다.';
$lang->ncenterlite_scrap_noti_about = '누군가 내 글을 스크랩하면 알림을 받습니다.';
$lang->ncenterlite_admin_content_noti_about = '관리자 알림을 받습니다.';
-$lang->ncenterlite_custom_noti_about = '기타 알림을 받습니다.';
+$lang->ncenterlite_custom_noti_about = '팔로우한 회원의 작성 글 알림을 받습니다.(현재 여까/핫산 한정)';
$lang->ncneterlite_block_individual = '개별 문서/댓글 알림 차단';
$lang->ncneterlite_block_individual_about = '개별적으로 문서/댓글을 차단할 수 있습니다.';
$lang->ncenterlite_activate = '사용';
diff --git a/modules/ncenterlite/ncenterlite.class.php b/modules/ncenterlite/ncenterlite.class.php
index 6e874de84..bebce6c33 100644
--- a/modules/ncenterlite/ncenterlite.class.php
+++ b/modules/ncenterlite/ncenterlite.class.php
@@ -75,11 +75,12 @@ class Ncenterlite extends ModuleObject
{
return true;
}
-
+ /*
if($oDB->isColumnExists('ncenterlite_user_set','custom_notify'))
{
return true;
}
+ */
// Extra data column
if (!$oDB->isColumnExists('ncenterlite_notify', 'data'))
@@ -165,11 +166,12 @@ class Ncenterlite extends ModuleObject
{
$oDB->dropColumn('ncenterlite_user_set', 'admin_content_notify');
}
-
+ /*
if($oDB->isColumnExists('ncenterlite_user_set','custom_notify'))
{
$oDB->dropColumn('ncenterlite_user_set', 'custom_notify');
}
+ */
// Composite index to speed up getNotifyList
if(!$oDB->isIndexExists('ncenterlite_notify', 'idx_member_srl_and_readed'))
diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php
index f27bc5769..42b3dc93b 100644
--- a/modules/ncenterlite/ncenterlite.model.php
+++ b/modules/ncenterlite/ncenterlite.model.php
@@ -123,6 +123,7 @@ class NcenterliteModel extends Ncenterlite
'vote' => 0,
'scrap' => 0,
'message' => 0,
+ 'custom' => 0,
);
}
diff --git a/modules/ncenterlite/queries/insertUserConfig.xml b/modules/ncenterlite/queries/insertUserConfig.xml
index e09cf6e03..e5e73920b 100644
--- a/modules/ncenterlite/queries/insertUserConfig.xml
+++ b/modules/ncenterlite/queries/insertUserConfig.xml
@@ -10,6 +10,7 @@
+
diff --git a/modules/ncenterlite/queries/updateUserConfig.xml b/modules/ncenterlite/queries/updateUserConfig.xml
index 41ac087df..8db6182ba 100644
--- a/modules/ncenterlite/queries/updateUserConfig.xml
+++ b/modules/ncenterlite/queries/updateUserConfig.xml
@@ -9,6 +9,7 @@
+
diff --git a/modules/ncenterlite/schemas/ncenterlite_user_set.xml b/modules/ncenterlite/schemas/ncenterlite_user_set.xml
index d5d1569a3..f178d14d9 100644
--- a/modules/ncenterlite/schemas/ncenterlite_user_set.xml
+++ b/modules/ncenterlite/schemas/ncenterlite_user_set.xml
@@ -6,5 +6,6 @@
+