Index: branches/dev/data/class/SC_CustomerList.php
===================================================================
--- branches/dev/data/class/SC_CustomerList.php	(revision 224)
+++ branches/dev/data/class/SC_CustomerList.php	(revision 11577)
@@ -167,8 +167,8 @@
 		if ( $mode == 'magazine' ){
 			if ( strlen($this->arrSql['htmlmail']) > 0 ) {
-				$this->setWhere( " mail_flag = ? ");
+				$this->setWhere( " mailmaga_flg = ? ");
 				$this->arrVal[] = $this->arrSql['htmlmail'];
 			} else {
-				$this->setWhere( " (mail_flag = 1 or mail_flag = 2) ");
+				$this->setWhere( " (mailmaga_flg = 1 or mailmaga_flg = 2) ");
 			}
 		}
@@ -295,7 +295,7 @@
 				dtb_customer.tel03,
 				dtb_customer.pref, 
-				dtb_customer_mail.mail_flag 
+				dtb_customer.mailmaga_flg 
 			FROM 
-				dtb_customer_mail LEFT OUTER JOIN dtb_customer USING(email)";
+				dtb_customer";
 		return $this->getSql(0);	
 	}
@@ -307,5 +307,5 @@
 	//¹ØÆþ¾¦ÉÊ¥³¡¼¥É¸¡º÷ÍÑSQL
 	function getBuyList(){
-		$this->select = "SELECT A.customer_id, A.name01, A.name02, A.kana01, A.kana02, A.sex, A.email, A.tel01, A.tel02, A.tel03, A.pref, A.mail_flag, B.order_email, B.order_id, C.product_code 
+		$this->select = "SELECT A.customer_id, A.name01, A.name02, A.kana01, A.kana02, A.sex, A.email, A.tel01, A.tel02, A.tel03, A.pref, A.mailmaga_flg, B.order_email, B.order_id, C.product_code 
 						FROM (dtb_customer LEFT OUTER JOIN dtb_customer_mail USING (email)) AS A LEFT OUTER JOIN dtb_order AS B ON 
 						A.email=B.order_email LEFT OUTER JOIN dtb_order_detail AS C ON B.order_id = C.order_id";
Index: branches/dev/data/lib/slib.php
===================================================================
--- branches/dev/data/lib/slib.php	(revision 11460)
+++ branches/dev/data/lib/slib.php	(revision 11577)
@@ -1773,7 +1773,7 @@
 /* ²ñ°÷¤Î¥á¥ë¥Þ¥¬ÅÐÏ¿¤¬¤¢¤ë¤«¤É¤¦¤«¤Î¥Á¥§¥Ã¥¯(²¾²ñ°÷¤ò´Þ¤Þ¤Ê¤¤) */
 function sfCheckCustomerMailMaga($email) {
-	$col = "T1.email, T1.mail_flag, T2.customer_id";
-	$from = "dtb_customer_mail AS T1 LEFT JOIN dtb_customer AS T2 ON T1.email = T2.email";
-	$where = "T1.email = ? AND T2.status = 2";
+	$col = "email, mailmaga_flg, customer_id";
+	$from = "dtb_customer";
+	$where = "email = ? AND status = 2";
 	$objQuery = new SC_Query();
 	$arrRet = $objQuery->select($col, $from, $where, array($email));
Index: branches/dev/data/Smarty/templates/shopping/nonmember_input.tpl
===================================================================
--- branches/dev/data/Smarty/templates/shopping/nonmember_input.tpl	(revision 21)
+++ branches/dev/data/Smarty/templates/shopping/nonmember_input.tpl	(revision 11577)
@@ -223,5 +223,5 @@
 						<td bgcolor="#f0f0f0" class="fs12">¥á¡¼¥ë¥Þ¥¬¥¸¥óÁ÷ÉդˤĤ¤¤Æ<span class="red">¢¨</span></td>
 						<td bgcolor="#ffffff" class="fs12">
-							<!--{assign var=key value="mail_flag"}-->
+							<!--{assign var=key value="mailmaga_flg"}-->
 							<!--{if $arrErr[$key]}-->
 							<!--{assign var=err_mail value="background-color: `$smarty.const.ERR_COLOR`"}-->
Index: branches/dev/data/Smarty/templates/admin/mail/index.tpl
===================================================================
--- branches/dev/data/Smarty/templates/admin/mail/index.tpl	(revision 17)
+++ branches/dev/data/Smarty/templates/admin/mail/index.tpl	(revision 11577)
@@ -394,5 +394,5 @@
 							<td><!--{$arrResults[i].name01|escape}--> <!--{$arrResults[i].name02|escape}--></td>
 							<td><!--{$arrResults[i].email|escape}--></td>
-							<!--{assign var="key" value="`$arrResults[i].mail_flag`"}-->
+							<!--{assign var="key" value="`$arrResults[i].mailmaga_flg`"}-->
 							<td align="center"><!--{$arrMAILMAGATYPE[$key]}--></td>
 							<td><!--{$arrResults[i].create_date|sfDispDBDate}--></td>
Index: branches/dev/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- branches/dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 149)
+++ branches/dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 11577)
@@ -141,5 +141,5 @@
 									<tr class="fs12n">
 										<td bgcolor="#f2f1ec" width="190">¥á¡¼¥ë¥Þ¥¬¥¸¥ó<span class="red"> *</span></td>
-										<td bgcolor="#ffffff" width="527"><!--{if $arrForm.mail_flag eq 1}-->HTML<!--{elseif $arrForm.mail_flag eq 2}-->¥Æ¥­¥¹¥È<!--{else}-->´õ˾¤·¤Ê¤¤<!--{/if}--></td>
+										<td bgcolor="#ffffff" width="527"><!--{if $arrForm.mailmaga_flg eq 1}-->HTML<!--{elseif $arrForm.mailmaga_flg eq 2}-->¥Æ¥­¥¹¥È<!--{else}-->´õ˾¤·¤Ê¤¤<!--{/if}--></td>
 									</tr>
 									<tr class="fs12n">
Index: branches/dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 21)
+++ branches/dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 11577)
@@ -213,8 +213,8 @@
 									<tr class="fs12n">
 										<td bgcolor="#f2f1ec" width="190">¥á¡¼¥ë¥Þ¥¬¥¸¥ó<span class="red"> *</span></td>
-										<td bgcolor="#ffffff" width="527"><span class="red12"><!--{$arrErr.mail_flag}--></span>
-											<input type="radio" name="mail_flag" value="1" <!--{if $arrErr.mail_flag != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mail_flag eq 1 or $list_data.mail_flag eq 4}-->checked<!--{/if}--> />HTML¡¡
-											<input type="radio" name="mail_flag" value="2" <!--{if $arrErr.mail_flag != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mail_flag eq 2 or $list_data.mail_flag eq 5}-->checked<!--{/if}--> />¥Æ¥­¥¹¥È¡¡
-											<input type="radio" name="mail_flag" value="3" <!--{if $arrErr.mail_flag != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mail_flag eq "" or $list_data.mail_flag eq 3 or $list_data.mail_flag eq 6}-->checked<!--{/if}--> />´õ˾¤·¤Ê¤¤</td>
+										<td bgcolor="#ffffff" width="527"><span class="red12"><!--{$arrErr.mailmaga_flg}--></span>
+											<input type="radio" name="mailmaga_flg" value="1" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq 1 or $list_data.mailmaga_flg eq 4}-->checked<!--{/if}--> />HTML¡¡
+											<input type="radio" name="mailmaga_flg" value="2" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq 2 or $list_data.mailmaga_flg eq 5}-->checked<!--{/if}--> />¥Æ¥­¥¹¥È¡¡
+											<input type="radio" name="mailmaga_flg" value="3" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq "" or $list_data.mailmaga_flg eq 3 or $list_data.mailmaga_flg eq 6}-->checked<!--{/if}--> />´õ˾¤·¤Ê¤¤</td>
 									</tr>
 									<tr>
Index: branches/dev/data/Smarty/templates/entry/confirm.tpl
===================================================================
--- branches/dev/data/Smarty/templates/entry/confirm.tpl	(revision 17)
+++ branches/dev/data/Smarty/templates/entry/confirm.tpl	(revision 11577)
@@ -90,5 +90,5 @@
 					<tr>
 						<td bgcolor="#f0f0f0" class="fs12">¥á¡¼¥ë¥Þ¥¬¥¸¥óÁ÷ÉդˤĤ¤¤Æ<span class="red">¢¨</span></td>
-						<td bgcolor="#ffffff" class="fs12"><!--{if $list_data.mail_flag eq 1}-->HTML¥á¡¼¥ë¡Ü¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë<!--{elseif $list_data.mail_flag eq 2}-->¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë<!--{else}-->¼õ¤±¼è¤é¤Ê¤¤<!--{/if}--></td>
+						<td bgcolor="#ffffff" class="fs12"><!--{if $list_data.mailmaga_flg eq 1}-->HTML¥á¡¼¥ë¡Ü¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë<!--{elseif $list_data.mailmaga_flg eq 2}-->¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë<!--{else}-->¼õ¤±¼è¤é¤Ê¤¤<!--{/if}--></td>
 					</tr>
 				</table>
Index: branches/dev/data/Smarty/templates/entry/index.tpl
===================================================================
--- branches/dev/data/Smarty/templates/entry/index.tpl	(revision 21)
+++ branches/dev/data/Smarty/templates/entry/index.tpl	(revision 11577)
@@ -196,8 +196,8 @@
 					<tr>
 						<td bgcolor="#f0f0f0" class="fs12">¥á¡¼¥ë¥Þ¥¬¥¸¥óÁ÷ÉդˤĤ¤¤Æ<span class="red">¢¨</span></td>
-						<td bgcolor="#ffffff" class="fs12"><span class="red"><!--{$arrErr.mail_flag}--></span>
-						<input type="radio" name="mail_flag" id="html" value="1" style="<!--{$arrErr.mail_flag|sfGetErrorColor}-->" <!--{if $mail_flag eq 1 || $mail_flag eq ""}-->checked<!--{/if}--> /><label for="html">HTML¥á¡¼¥ë¡Ü¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë</label><br>
-						<input type="radio" name="mail_flag" id="text"value="2" style="<!--{$arrErr.mail_flag|sfGetErrorColor}-->" <!--{if $mail_flag eq 2}-->checked<!--{/if}--> /><label for="text">¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë</label><br>
-						<input type="radio" name="mail_flag" id="no" value="3" style="<!--{$arrErr.mail_flag|sfGetErrorColor}-->" <!--{if $mail_flag eq 3}-->checked<!--{/if}--> /><label for="no">¼õ¤±¼è¤é¤Ê¤¤</label></td>
+						<td bgcolor="#ffffff" class="fs12"><span class="red"><!--{$arrErr.mailmaga_flg}--></span>
+						<input type="radio" name="mailmaga_flg" id="html" value="1" style="<!--{$arrErr.mailmaga_flg|sfGetErrorColor}-->" <!--{if $mailmaga_flg eq 1 || $mailmaga_flg eq ""}-->checked<!--{/if}--> /><label for="html">HTML¥á¡¼¥ë¡Ü¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë</label><br>
+						<input type="radio" name="mailmaga_flg" id="text"value="2" style="<!--{$arrErr.mailmaga_flg|sfGetErrorColor}-->" <!--{if $mailmaga_flg eq 2}-->checked<!--{/if}--> /><label for="text">¥Æ¥­¥¹¥È¥á¡¼¥ë¤ò¼õ¤±¼è¤ë</label><br>
+						<input type="radio" name="mailmaga_flg" id="no" value="3" style="<!--{$arrErr.mailmaga_flg|sfGetErrorColor}-->" <!--{if $mailmaga_flg eq 3}-->checked<!--{/if}--> /><label for="no">¼õ¤±¼è¤é¤Ê¤¤</label></td>
 					</tr>
 				</table>