From 6ad70419ab44b14fd2d7420f70dc366f77a09e94 Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Thu, 8 Mar 2012 01:43:52 +0000
Subject: [PATCH] issue 1630 fixed display identifier in member leave form

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10381 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.view.php               | 13 +++++++++++++
 modules/member/skins/default/leave_form.html |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 91e3ae1e7..c36df0361 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -301,11 +301,24 @@
             // A message appears if the user is not logged-in
             if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
+			$memberConfig = $oMemberModel->getMemberConfig();
+
             $logged_info = Context::get('logged_info');
             $member_srl = $logged_info->member_srl;
 
             $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
             Context::set('member_info',$member_info);
+
+			if($memberConfig->identifier == 'user_id')
+			{
+				Context::set('identifier', 'user_id');
+				Context::set('formValue', $member_info->user_id);
+			}
+			else
+			{
+				Context::set('identifier', 'email_address');
+				Context::set('formValue', $member_info->email_address);
+			}
             // Set a template file
             $this->setTemplateFile('leave_form');
         }
diff --git a/modules/member/skins/default/leave_form.html b/modules/member/skins/default/leave_form.html
index d179a3a6e..65585a11f 100644
--- a/modules/member/skins/default/leave_form.html
+++ b/modules/member/skins/default/leave_form.html
@@ -11,8 +11,8 @@
     <input type="hidden" name="page" value="{$page}" />
 	<ul>
 		<li>
-			<p class="q">{$lang->user_id}</p>
-			<p class="a">{$member_info->user_id}</p>
+			<p class="q">{Context::getLang($identifier)}</p>
+			<p class="a">{$formValue}</p>
 		</li>
 		<li>
 			<p class="q"><label for="cpw">{$lang->password}</label></p>