From a069ec6c93347a686ce7e30143402fb5299fff79 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 5 Jun 2018 09:39:15 +0900
Subject: [PATCH] =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B2=84=20=EC=86=8C?=
 =?UTF-8?q?=EC=85=9C=20=EC=95=84=EC=9D=B4=EB=94=94=EB=A1=9C=20=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=EC=8B=9C=20=EC=9D=B4=EB=A6=84=EC=9D=84=20=EA=B0=80?=
 =?UTF-8?q?=EC=A0=B8=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/social/Hybrid/Providers/Naver.php    | 2 +-
 plugin/social/register_member.php           | 1 +
 skin/social/social_register_member.skin.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugin/social/Hybrid/Providers/Naver.php b/plugin/social/Hybrid/Providers/Naver.php
index 431425b43..4927276f8 100644
--- a/plugin/social/Hybrid/Providers/Naver.php
+++ b/plugin/social/Hybrid/Providers/Naver.php
@@ -118,7 +118,7 @@ class Hybrid_Providers_Naver extends Hybrid_Provider_Model_OAuth2
         //$this->user->profile->identifier    = (array_key_exists('enc_id',$data))?$data['enc_id']:"";
         $this->user->profile->identifier    = (array_key_exists('id',$data))?$data['id']:"";
         $this->user->profile->age           = (array_key_exists('age',$data))?$data['age']:"";
-        $this->user->profile->displayName = '';
+        $this->user->profile->username = (array_key_exists('name', $data)) ? $data['name'] : "";
         /*
         if( array_key_exists('email',$data) ){
             $tmp = explode("@", $data['email']);
diff --git a/plugin/social/register_member.php b/plugin/social/register_member.php
index 4451c3b61..60ec6ea8f 100644
--- a/plugin/social/register_member.php
+++ b/plugin/social/register_member.php
@@ -31,6 +31,7 @@ $user_id = $user_profile->sid ? preg_replace("/[^0-9a-z_]+/i", "", $user_profile
 $user_id = exist_mb_id_recursive($user_id);
 $user_nick = exist_mb_nick_recursive($user_nick, '');
 $is_exists_email = $user_email ? exist_mb_email($user_email, '') : false;
+$user_name = isset($user_profile->username) ? $user_profile->username : ''; 
 
 // 불법접근을 막도록 토큰생성
 $token = md5(uniqid(rand(), true));
diff --git a/skin/social/social_register_member.skin.php b/skin/social/social_register_member.skin.php
index ccd41f476..13fd8ee27 100644
--- a/skin/social/social_register_member.skin.php
+++ b/skin/social/social_register_member.skin.php
@@ -23,7 +23,7 @@ $email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.
     <form id="fregisterform" name="fregisterform" action="<?php echo $register_action_url; ?>" onsubmit="return fregisterform_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off">
     <input type="hidden" name="w" value="<?php echo $w; ?>">
     <input type="hidden" name="url" value="<?php echo $urlencode; ?>">
-    <input type="hidden" name="mb_name" value="<?php echo $user_nick; ?>" >
+    <input type="hidden" name="mb_name" value="<?php echo $user_name ? $user_name : $user_nick ?>" >
     <input type="hidden" name="provider" value="<?php echo $provider_name;?>" >
     <input type="hidden" name="action" value="register">