Changeset 18792 for branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

Timestamp:

2010/08/26 10:42:00 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100825073846-mzg8ka4y21o1nk6o

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_CustomerList.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CustomerList.php
data/class/SC_SelectSql.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_SelectSql.php
data/class/pages/admin/mail/LC_Page_Admin_Mail.php 15640@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail.php
data/class/pages/admin/order/LC_Page_Admin_Order.php 15584@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order.php
data/class/pages/admin/products/LC_Page_Admin_Products.php 15342@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products.php
data/class/pages/admin/products/LC_Page_Admin_Products_Review.php 15537@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Review.php
data/class/pages/admin/products/LC_Page_Admin_Products_Trackback.php 15546@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Trackback.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100826014156-g12l1o38gsj73acs

bzr:revno:

2275

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-parents:

data/class/SC_CustomerList.php ohkouchi@loop-az.jp-20100820090626-dkyj2ngdh7vklaow
data/class/SC_SelectSql.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/admin/mail/LC_Page_Admin_Mail.php ohkouchi@loop-az.jp-20100819104758-beubop5hq0pwdqhx
data/class/pages/admin/order/LC_Page_Admin_Order.php ohkouchi@loop-az.jp-20100820090626-dkyj2ngdh7vklaow
data/class/pages/admin/products/LC_Page_Admin_Products.php ohkouchi@loop-az.jp-20100820090626-dkyj2ngdh7vklaow
data/class/pages/admin/products/LC_Page_Admin_Products_Review.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/admin/products/LC_Page_Admin_Products_Trackback.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
data/class/pages/products/LC_Page_Products_List.php ohkouchi@loop-az.jp-20100803111301-u8ph4za35y4il0dh
data/class/util/SC_Utils.php ohkouchi@loop-az.jp-20100820090626-dkyj2ngdh7vklaow

bzr:timestamp:

2010-08-26 10:41:56.190000057 +0900

bzr:user-agent:

bzr2.1.2+bzr-svn1.0.2

svn:original-date:

2010-08-26T01:41:56.190000Z

Message:

r18789 の変更に伴い SC_Utils::sfManualEscape() が不具合を発生していたので, 使用しないように修正(#801)

File:

• branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (modified) (4 diffs)

branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

@@ -229 +229 @@
             if (empty($this->arrErr)) {
                 $this->list_data['name'] = isset($this->list_data['name'])
-                    ? SC_Utils_Ex::sfManualEscape($this->list_data['name']) : "";
+                    ? $this->list_data['name'] : "";
                 // hidden要素作成
                 $this->arrHidden = $this->lfGetHidden($this->list_data);
@@ -300 +300 @@
             // 検索開始
             if (empty($this->arrErr)) {
-                $this->list_data['name'] = isset($this->list_data['name']) ? SC_Utils_Ex::sfManualEscape($this->list_data['name']) : "";
+                $this->list_data['name'] = isset($this->list_data['name']) ? $this->list_data['name'] : "";
                 $this->arrHidden = $this->lfGetHidden($this->list_data); // hidden要素作成
 
@@ -352 +352 @@
                 $this->list_data['name'] =
                     isset($this->list_data['name'])
-                    ? SC_Utils_Ex::sfManualEscape($this->list_data['name']) : "";
+                    ? $this->list_data['name'] : "";
 
                 if ( $_POST['mode'] == 'regist_confirm'){
@@ -410 +410 @@
             $from = "dtb_order LEFT JOIN dtb_order_detail USING(order_id)";
             $where = "product_code LIKE ? AND del_flg = 0";
-            $val = SC_Utils_Ex::sfManualEscape($keyword);
-            $arrVal[] = "%$val%";
             $objQuery = new SC_Query();
             $objQuery->setGroupBy("customer_id, order_id");
-            $arrRet = $objQuery->select($col, $from, $where, $arrVal);
+            $arrRet = $objQuery->select($col, $from, $where, array($keyword));
             $arrCustomerOrderId = SC_Utils_Ex::sfArrKeyValues($arrRet, "customer_id", "order_id");
         }