Changeset 18743 for branches/comu-ver2/data/class/pages/entry/LC_Page_Entry.php

Timestamp:

2010/06/23 12:30:22 (14 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18711

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/default/admin/mail/template.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Ftemplate.tpl
data/app_initial.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Fapp_initial.php
data/class/SC_DbConn.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_DbConn.php
data/class/helper/SC_Helper_Mail.php 15618@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mail.php
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/admin/mail/LC_Page_Admin_Mail_Template.php 15646@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail_Template.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
data/class/pages/mypage/LC_Page_Mypage_Login.php 16076@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Login.php
data/class/pages/mypage/LC_Page_Mypage_LoginCheck.php 16090@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_LoginCheck.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
data/require_base.php 17578@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Frequire_base.php
data/require_classes.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Frequire_classes.php
data/require_safe.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Frequire_safe.php
html/admin/require.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fadmin%2Frequire.php
html/error.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fhtml%2Ferror.php
html/handle_error.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fhtml%2Fhandle_error.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/mobile/require.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fmobile%2Frequire.php
html/require.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Frequire.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20100623032154-iz11cjzwv78uwuuj

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20100623032937-dhwktuevjyk0jv13

bzr:revno:

2241

bzr:revprop:branch-nick:

branches/comu-ver2

bzr:root:

branches/comu-ver2

bzr:text-parents:

data/Smarty/templates/default/admin/mail/template.tpl ohkouchi@loop-az.jp-20100614082324-fsyp4ss6t8s1l9hk ohkouchi@loop-az.jp-20100614051951-gzit79stppmvaiyr
data/app_initial.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100219075807-b8ws8csnozrnfz6y
data/class/SC_DbConn.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100602075404-5q29ytxyvlr3j2po
data/class/helper/SC_Helper_Mail.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100602075404-5q29ytxyvlr3j2po
data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100623032154-iz11cjzwv78uwuuj
data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100614051951-gzit79stppmvaiyr
data/class/pages/entry/LC_Page_Entry.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100623032154-iz11cjzwv78uwuuj
data/class/pages/mypage/LC_Page_Mypage_Change.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100623032154-iz11cjzwv78uwuuj
data/class/pages/mypage/LC_Page_Mypage_Login.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100614051951-gzit79stppmvaiyr
data/class/pages/mypage/LC_Page_Mypage_LoginCheck.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100614051951-gzit79stppmvaiyr
data/class/util/SC_Utils.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100614051951-gzit79stppmvaiyr
data/install.php ohkouchi@loop-az.jp-20100607052412-62jchhyz1p39ero4
data/require_base.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100602075404-5q29ytxyvlr3j2po
data/require_classes.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100602075404-5q29ytxyvlr3j2po
data/require_safe.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100219075807-b8ws8csnozrnfz6y
html/admin/require.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100219075807-b8ws8csnozrnfz6y
html/error.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100219075807-b8ws8csnozrnfz6y
html/handle_error.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100219075807-b8ws8csnozrnfz6y
html/install/sql/insert_data.sql ohkouchi@loop-az.jp-20100614052157-t91tlqk79hn81vpa ohkouchi@loop-az.jp-20100614052106-c1abanrq1ve2yp4w
html/mobile/require.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100219075807-b8ws8csnozrnfz6y
html/require.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m ohkouchi@loop-az.jp-20100219075807-b8ws8csnozrnfz6y

bzr:timestamp:

2010-06-23 12:29:37.201999903 +0900

bzr:user-agent:

bzr2.1.2+bzr-svn1.0.2

svn:original-date:

2010-06-23T03:29:37.202000Z

Message:

merged r18741

• 検索条件を修正

File:

• branches/comu-ver2/data/class/pages/entry/LC_Page_Entry.php (modified) (1 diff)

branches/comu-ver2/data/class/pages/entry/LC_Page_Entry.php

@@ -812 +812 @@
             $array["email"] = strtolower($array["email"]);
             $objQuery = new SC_Query();
-            $arrRet = $objQuery->select("email, update_date, del_flg", "dtb_customer","email = ? ORDER BY del_flg", array($array["email"]));
+            $arrRet = $objQuery->select("email, update_date, del_flg", "dtb_customer","email = ? OR email_mobile = ? ORDER BY del_flg", array($array["email"], $array["email"]));
 
             if(count($arrRet) > 0) {