Changeset 16325 for branches/feature-templates/data/lib/slib.php

Timestamp:

2007/10/08 19:09:23 (19 years ago)

Author:

adachi

Message:

merged branches/beta r15825-15842

File:

• branches/feature-templates/data/lib/slib.php (modified) (2 diffs)

branches/feature-templates/data/lib/slib.php

@@ -1708 +1708 @@
 }
 
-/** ¼õÃí´°Î»¥á¡¼¥ëÁ÷¿®
- *  $template_id ¤¬ 1¡§·ÈÂÓÍѥƥó¥×¥ì¡¼¥È¡¢0¡§PCÍѥƥó¥×¥ì¡¼¥È
+/**
+ *  ¼õÃí´°Î»¥á¡¼¥ëÁ÷¿®
+ *  Í×½¤Àµ(trac #172)
  */
 function sfSendOrderMail($order_id, $template_id, $subject = "", $body = "", $send = true) {
@@ -1920 +1921 @@
 }
 
-/* ²ñ°÷¤Î¥á¥ë¥Þ¥¬ÅÐÏ¿¤¬¤¢¤ë¤«¤É¤¦¤«¤Î¥Á¥§¥Ã¥¯(²¾²ñ°÷¤ò´Þ¤Þ¤Ê¤¤) */
+/* ²ñ°÷ÅÐÏ¿¤¬¤¢¤ë¤«¤É¤¦¤«¤Î¥Á¥§¥Ã¥¯(²¾²ñ°÷¤ò´Þ¤Þ¤Ê¤¤) */
 function sfCheckCustomerMailMaga($email) {
     $col = "email, mailmaga_flg, customer_id";
     $from = "dtb_customer";
-    $where = "email = ? AND status = 2";
+    $where = "email = ? AND status = 2 AND del_flg = 0";
     $objQuery = new SC_Query();
     $arrRet = $objQuery->select($col, $from, $where, array($email));