From 32e6de6c29a42040ba2e8f70a97a8254a7e135fb Mon Sep 17 00:00:00 2001
From: misol <misol.kr@gmail.com>
Date: Thu, 7 Feb 2013 17:07:37 +0000
Subject: [PATCH] Issue 2860, the patch applied.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12726 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.admin.view.php | 2 +-
 modules/member/member.controller.php | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 3bcf6bf60..e52e9a808 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -464,7 +464,7 @@ class memberAdminView extends member
 					else if($formInfo->name == 'birthday')
 					{
 						$formTag->type = 'date';
-						$inputTag = sprintf('<input type="hidden" name="birthday" id="date_birthday" value="%s" /><input type="date" placeholder="YYYY-MM-DD" class="inputDate" id="birthday" value="%s" /> <input type="button" value="%s" class="btn dateRemover" />',
+						$inputTag = sprintf('<input type="hidden" name="birthday" id="date_birthday" value="%s" /><input type="date" placeholder="YYYY-MM-DD" name="birthday_ui" class="inputDate" id="birthday" value="%s" /> <input type="button" value="%s" class="btn dateRemover" />',
 							$memberInfo['birthday'],
 							zdate($memberInfo['birthday'], 'Y-m-d', false),
 							$lang->cmd_delete);
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index ef389666b..7a7f38683 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -271,7 +271,10 @@ class memberController extends member
 		foreach($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
+			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
 		}
+		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
 		$args->member_srl = getNextSequence();
 		$args->list_order = -1 * $args->member_srl;
 		$args->find_account_answer = Context::get('find_account_answer');
@@ -455,11 +458,13 @@ class memberController extends member
 		foreach($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
+			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
 		}
 		// Login Information
 		$logged_info = Context::get('logged_info');
 		$args->member_srl = $logged_info->member_srl;
-		$args->birthday = strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>''));
+		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
 		// Remove some unnecessary variables from all the vars
 		$all_args = Context::getRequestVars();
 		unset($all_args->module);