Index: branches/dev/data/lib/slib.php
===================================================================
--- branches/dev/data/lib/slib.php	(revision 14006)
+++ branches/dev/data/lib/slib.php	(revision 14055)
@@ -1660,5 +1660,5 @@
 
 /* ¼õÃí´°Î»¥á¡¼¥ëÁ÷¿® */
-function sfSendOrderMail($order_id, $template_id, $subject = "", $header = "", $footer = "", $send = true) {
+function sfSendOrderMail($order_id, $template_id, $subject = "", $body, $send = true) {
 	global $arrMAILTPLPATH;
 	
@@ -1670,14 +1670,14 @@
 	$objQuery = new SC_Query();
 		
-	if($subject == "" && $header == "" && $footer == "") {
+	if($subject == "" && $body == "" ) {
 		// ¥á¡¼¥ë¥Æ¥ó¥×¥ì¡¼¥È¾ðÊó¤Î¼èÆÀ
 		$where = "template_id = ?";
-		$arrRet = $objQuery->select("subject, header, footer", "dtb_mailtemplate", $where, array($template_id));
-		$objPage->tpl_header = $arrRet[0]['header'];
-		$objPage->tpl_footer = $arrRet[0]['footer'];
+		$arrRet = $objQuery->select("subject, body", "dtb_mailtemplate", $where, array($template_id));
+		$objPage->tpl_header = $arrRet[0]['body'];
+//		$objPage->tpl_footer = $arrRet[0]['footer'];
 		$tmp_subject = $arrRet[0]['subject'];
 	} else {
-		$objPage->tpl_header = $header;
-		$objPage->tpl_footer = $footer;
+		$objPage->tpl_header = $body;
+//		$objPage->tpl_footer = $footer;
 		$tmp_subject = $subject;
 	}