Ignore:
Timestamp:
2010/06/23 12:16:05 (14 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100623022301-ty3d3yv1j2e0x1rr
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 15568@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcustomer%2FLC_Page_Admin_Customer_Edit.php
data/class/pages/entry/LC_Page_Entry.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fentry%2FLC_Page_Entry.php
data/class/pages/mypage/LC_Page_Mypage_Change.php 16070@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Change.php
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100623031559-el9ju6xj2tlx1z5k
bzr:revno:
1945
bzr:revprop:branch-nick:
branches/version-2_4
bzr:root:
branches/version-2_4
bzr:text-parents:

data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php ohkouchi@loop-az.jp-20100622085323-j5ygw8nt52f395cw
data/class/pages/entry/LC_Page_Entry.php ohkouchi@loop-az.jp-20100622084403-entzq52cpgi048b3
data/class/pages/mypage/LC_Page_Mypage_Change.php ohkouchi@loop-az.jp-20100622084403-entzq52cpgi048b3
bzr:timestamp:
2010-06-23 12:15:59.976000071 +0900
bzr:user-agent:
bzr2.1.2+bzr-svn1.0.2
svn:original-date:
2010-06-23T03:15:59.976000Z
Message:

merged r18739

  • 検索条件を修正
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php

    r18735 r18741  
    290290        if (strlen($array["email"]) > 0) { 
    291291            $array['email'] = strtolower($array['email']); 
    292             $sql = "SELECT customer_id FROM dtb_customer WHERE email ILIKE ? escape '#' AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?"; 
     292            $sql = "SELECT customer_id FROM dtb_customer WHERE (email ILIKE ? escape '#' OR email_mobile ILIKE ? escape '#') AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?"; 
    293293            $checkMail = ereg_replace( "_", "#_", $array["email"]); 
    294             $result = $this->objConn->getAll($sql, array($checkMail, $array["customer_id"])); 
     294            $result = $this->objConn->getAll($sql, array($checkMail, $checkMail, $array["customer_id"])); 
    295295            if (count($result) > 0) { 
    296296                $objErr->arrErr["email"] .= "※ すでに登録されているメールアドレスです。"; 
     
    302302        if (strlen($array["email_mobile"]) > 0) { 
    303303            $array['email_mobile'] = strtolower($array['email_mobile']); 
    304             $sql = "SELECT customer_id FROM dtb_customer WHERE email_mobile ILIKE ? escape '#' AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?"; 
     304            $sql = "SELECT customer_id FROM dtb_customer WHERE (email ILIKE ? escape '#' OR email_mobile ILIKE ? escape '#') AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?"; 
    305305            $checkMail = ereg_replace( "_", "#_", $array["email_mobile"]); 
    306             $result = $this->objConn->getAll($sql, array($checkMail, $array["customer_id"])); 
     306            $result = $this->objConn->getAll($sql, array($checkMail, $checkMail, $array["customer_id"])); 
    307307            if (count($result) > 0) { 
    308308                $objErr->arrErr["email_mobile"] .= "※ すでに登録されているメールアドレス(モバイル)です。"; 
Note: See TracChangeset for help on using the changeset viewer.