[Svn-src-all:2673] [version-2_12-dev 21572] #1672 (非会員購入時「お届け先の複数指定」から戻るボタンで遷移すると追加したお届け先が削除される)

[Seasoft]

Subversion committed to /home/svn/open 21572
http://svn.ec-cube.net/open_trac/changeset/21572
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2012-03-02 02:11:15 +0900 (金, 02  3月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1672 (非会員購入時「お届け先の複数指定」から戻るボタンで遷移すると追加したお届け先が削除される)
  * 改修後も2つ目以降が削除されていた不具合を修正

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php

変更: branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php	2012-03-01 16:38:44 UTC (rev 21571)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php	2012-03-01 17:11:15 UTC (rev 21572)
@@ -407,7 +407,7 @@
      * @return void
      */
     function unsetShippingTemp() {
-        $this->unsetAllShippingTemp(true);
+        SC_Helper_Purchase_Ex::unsetAllShippingTemp(true);
     }
 
     /**
@@ -416,7 +416,7 @@
      * @param bool $multiple_temp 複数お届け先の画面戻り処理用の情報も破棄するか
      * @return void
      */
-    function unsetAllShippingTemp($multiple_temp = false) {
+    static function unsetAllShippingTemp($multiple_temp = false) {
         unset($_SESSION['shipping']);
         if ($multiple_temp) {
             unset($_SESSION['multiple_temp']);
@@ -429,7 +429,7 @@
      * @param integer $shipping_id 配送先ID
      * @return void
      */
-    function unsetOneShippingTemp($shipping_id) {
+    static function unsetOneShippingTemp($shipping_id) {
         unset($_SESSION['shipping'][$shipping_id]);
     }
 

変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php	2012-03-01 16:38:44 UTC (rev 21571)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php	2012-03-01 17:11:15 UTC (rev 21572)
@@ -369,14 +369,14 @@
         $arrShipping = $objPurchase->extractShipping($arrParams);
 
         if ($isMultiple) {
-            $objPurchase->unsetShippingTemp(0);
-            $objPurchase->unsetShippingTemp(1);
+            $objPurchase->unsetOneShippingTemp(0);
+            $objPurchase->unsetOneShippingTemp(1);
             $objPurchase->saveShippingTemp($arrShippingOwn, 0);
             if ($arrParams['deliv_check'] == '1') {
                 $objPurchase->saveShippingTemp($arrShipping, 1);
             }
         } else {
-            $objPurchase->unsetShippingTemp();
+            $objPurchase->unsetOneShippingTemp();
             if ($arrParams['deliv_check'] == '1') {
                 $objPurchase->saveShippingTemp($arrShipping, 0);
             } else {