[Svn-src-all:2749] [version-2_12-dev 21648] #1671 (SC_Helper_Purchase#clearShipmentItemTemp が配送情報まで削除している)

[Seasoft]

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

Log:
--------------------------------------------------------
#1671 (SC_Helper_Purchase#clearShipmentItemTemp が配送情報まで削除している)
  * 修正

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.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-14 12:36:17 UTC (rev 21647)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php	2012-03-14 18:49:28 UTC (rev 21648)
@@ -314,12 +314,12 @@
      */
     function clearShipmentItemTemp($shipping_id = null) {
         if (is_null($shipping_id)) {
-            if (!isset($_SESSION['shipping'][$shipping_id])) return;
-            if (!is_array($_SESSION['shipping'][$shipping_id])) return;
-            foreach (array_keys($_SESSION['shipping'][$shipping_id]) as $key) {
+            foreach (array_keys($_SESSION['shipping']) as $key) {
                 $this->clearShipmentItemTemp($key);
             }
         } else {
+            if (!isset($_SESSION['shipping'][$shipping_id])) return;
+            if (!is_array($_SESSION['shipping'][$shipping_id])) return;
             unset($_SESSION['shipping'][$shipping_id]['shipment_item']);
         }
     }