Index: temp/trunk/html/mypage/change.php
===================================================================
--- temp/trunk/html/mypage/change.php	(revision 1967)
+++ temp/trunk/html/mypage/change.php	(revision 1968)
@@ -85,27 +85,35 @@
 	$objPage->arrForm['email'] = strtolower($objPage->arrForm['email']);		// email¤Ï¤¹¤Ù¤Æ¾®Ê¸»ú¤Ç½èÍý
 
-	//¥¨¥é¡¼¥Á¥§¥Ã¥¯
-	$objPage->arrErr = lfErrorCheck($objPage->arrForm);
-	$email_flag = true;
-	//¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÊѹ¹¤·¤Æ¤¤¤ë¾ì¹ç¡¢¥á¡¼¥ë¥¢¥É¥ì¥¹¤Î½ÅÊ£¥Á¥§¥Ã¥¯
-	if ($objPage->arrForm['email'] != $objCustomer->getValue('email')){
-		$email_cnt = $objQuery->count("dtb_customer","delete=0 AND email=?", array($objPage->arrForm['email']));
-		if ($email_cnt > 0){
-			$email_flag = false;
-		}
-	}
-	//¥¨¥é¡¼¤Ê¤·¤Ç¤«¤Ä¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬½ÅÊ£¤·¤Æ¤¤¤Ê¤¤¾ì¹ç
-	if ($objPage->arrErr == "" && $email_flag == true){
-		//³Îǧ¥Ú¡¼¥¸¤Ø
-		$objPage->tpl_mainpage = 'mypage/change_confirm.tpl';
-		$objPage->tpl_title = 'MY¥Ú¡¼¥¸/²ñ°÷ÅÐÏ¿ÆâÍÆÊѹ¹(³Îǧ¥Ú¡¼¥¸)';
-		$passlen = strlen($objPage->arrForm['password']);
-		$objPage->passlen = lfPassLen($passlen);
-	} else {
-		lfFormReturn($objPage->arrForm,$objPage);
-		if ($email_flag == false){
-			$objPage->arrErr['email'].="´û¤Ë»ÈÍѤµ¤ì¤Æ¤¤¤ë¥á¡¼¥ë¥¢¥É¥ì¥¹¤Ç¤¹¡£";
-		}
-	}
+	/* ÃÂÀ¸Æü¤ÎÊѹ¹¤Ï²Äǽ¤Ë¤¹¤ë
+	//ÃÂÀ¸ÆüÉÔÀµÊѹ¹¤Î¥Á¥§¥Ã¥¯
+	$arrCustomer = lfGetCustomerData();
+	if ($arrCustomer['birth'] != "" && ($objPage->arrForm['year'] != $arrCustomer['year'] || $objPage->arrForm['month'] != $arrCustomer['month'] || $objPage->arrForm['day'] != $arrCustomer['day'])){
+		sfDispSiteError(CUSTOMER_ERROR);
+	}else{
+	*/
+		//¥¨¥é¡¼¥Á¥§¥Ã¥¯
+		$objPage->arrErr = lfErrorCheck($objPage->arrForm);
+		$email_flag = true;
+		//¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÊѹ¹¤·¤Æ¤¤¤ë¾ì¹ç¡¢¥á¡¼¥ë¥¢¥É¥ì¥¹¤Î½ÅÊ£¥Á¥§¥Ã¥¯
+		if ($objPage->arrForm['email'] != $objCustomer->getValue('email')){
+			$email_cnt = $objQuery->count("dtb_customer","delete=0 AND email=?", array($objPage->arrForm['email']));
+			if ($email_cnt > 0){
+				$email_flag = false;
+			}
+		}
+		//¥¨¥é¡¼¤Ê¤·¤Ç¤«¤Ä¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬½ÅÊ£¤·¤Æ¤¤¤Ê¤¤¾ì¹ç
+		if ($objPage->arrErr == "" && $email_flag == true){
+			//³Îǧ¥Ú¡¼¥¸¤Ø
+			$objPage->tpl_mainpage = 'mypage/change_confirm.tpl';
+			$objPage->tpl_title = 'MY¥Ú¡¼¥¸/²ñ°÷ÅÐÏ¿ÆâÍÆÊѹ¹(³Îǧ¥Ú¡¼¥¸)';
+			$passlen = strlen($objPage->arrForm['password']);
+			$objPage->passlen = lfPassLen($passlen);
+		} else {
+			lfFormReturn($objPage->arrForm,$objPage);
+			if ($email_flag == false){
+				$objPage->arrErr['email'].="´û¤Ë»ÈÍѤµ¤ì¤Æ¤¤¤ë¥á¡¼¥ë¥¢¥É¥ì¥¹¤Ç¤¹¡£";
+			}
+		}
+	//}
 	break;
 	
@@ -120,9 +128,12 @@
 	$arrForm = lfConvertParam($_POST, $arrRegistColumn);
 	$arrForm['email'] = strtolower($arrForm['email']);		// email¤Ï¤¹¤Ù¤Æ¾®Ê¸»ú¤Ç½èÍý
+	
+	/* ÃÂÀ¸Æü¤ÎÊѹ¹¤Ï²Äǽ¤Ë¤¹¤ë
 	//ÃÂÀ¸ÆüÉÔÀµÊѹ¹¤Î¥Á¥§¥Ã¥¯
 	$arrCustomer = lfGetCustomerData();
 	if ($arrCustomer['birth'] != "" && ($arrForm['year'] !=  $arrCustomer['year'] || $arrForm['month'] != $arrCustomer['month'] || $arrForm['day'] != $arrCustomer['day'])){
 		sfDispSiteError(CUSTOMER_ERROR);
-	} else {
+	} else {*/
+	
 		//¥¨¥é¡¼¥Á¥§¥Ã¥¯
 		$objPage->arrErr = lfErrorCheck($objPage->arrForm);
@@ -148,5 +159,5 @@
 			sfDispSiteError(CUSTOMER_ERROR);
 		}
-	}
+	//}
 	break;