[Svn-src-all:3927] [version-2_13-dev 22841] #2255 (SC_Helper_DB#sfGetBasisData 不適切なキャッシュが行われる場合がある)

[Seasoft]

Subversion committed to /home/svn/open 22841
http://svn.ec-cube.net/open_trac/changeset/22841
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2013-05-30 14:14:23 +0900 (木, 30  5月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2255 (SC_Helper_DB#sfGetBasisData 不適切なキャッシュが行われる場合がある)

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php
U   branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
U   branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
U   branches/version-2_13-dev/data/class/pages/rss/LC_Page_Rss.php

変更: branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php	2013-05-28 13:59:07 UTC (rev 22840)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php	2013-05-30 05:14:23 UTC (rev 22841)
@@ -128,29 +128,19 @@
      * 2回目以降はキャッシュされた結果を使用する.
      *
      * @param boolean $force 強制的にDB取得するか
-     * @param string $col 取得カラムを指定する
      * @return array 店舗基本情報の配列
      */
-    function sfGetBasisData($force = false, $col = '')
+    function sfGetBasisData($force = false)
     {
-        static $data = array();
+        static $arrData = null;
 
-        if ($force || empty($data)) {
+        if ($force || is_null($arrData)) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
 
-            if ($col === '') {
-                $arrRet = $objQuery->select('*', 'dtb_baseinfo');
-            } else {
-                $arrRet = $objQuery->select($col, 'dtb_baseinfo');
-            }
-
-            if (isset($arrRet[0])) {
-                $data = $arrRet[0];
-            } else {
-                $data = array();
-            }
+            $arrData = $objQuery->getRow('*', 'dtb_baseinfo');
         }
-        return $data;
+
+        return $arrData;
     }
 
     /**

変更: branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php	2013-05-28 13:59:07 UTC (rev 22840)
+++ branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php	2013-05-30 05:14:23 UTC (rev 22841)
@@ -105,9 +105,7 @@
                 $this->tpl_onload = "window.alert('ポイント設定が完了しました。');";
             }
         } else {
-            $arrCol = $objFormParam->getKeyList(); // キー名一覧を取得
-            $col    = SC_Utils_Ex::sfGetCommaList($arrCol);
-            $arrRet = $objDb->sfGetBasisData(true, $col);
+            $arrRet = $objDb->sfGetBasisData();
             $objFormParam->setParam($arrRet);
         }
         $this->arrForm = $objFormParam->getFormParamList();

変更: branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	2013-05-28 13:59:07 UTC (rev 22840)
+++ branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	2013-05-30 05:14:23 UTC (rev 22841)
@@ -106,9 +106,7 @@
                 $this->tpl_onload = "window.alert('特定商取引法の登録が完了しました。');";
             }
         } else {
-            $arrCol = $objFormParam->getKeyList(); // キー名一覧を取得
-            $col    = SC_Utils_Ex::sfGetCommaList($arrCol);
-            $arrRet = $objDb->sfGetBasisData(true, $col);
+            $arrRet = $objDb->sfGetBasisData();
             $objFormParam->setParam($arrRet);
         }
         $this->arrForm = $objFormParam->getFormParamList();

変更: branches/version-2_13-dev/data/class/pages/rss/LC_Page_Rss.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/rss/LC_Page_Rss.php	2013-05-28 13:59:07 UTC (rev 22840)
+++ branches/version-2_13-dev/data/class/pages/rss/LC_Page_Rss.php	2013-05-30 05:14:23 UTC (rev 22841)
@@ -107,7 +107,7 @@
         $arrNews = $objNews->getList();
 
         $objDb = new SC_Helper_DB_Ex();
-        $arrInfo = $objDb->sfGetBasisData(FALSE, 'shop_name, email04');
+        $arrInfo = $objDb->sfGetBasisData();
 
         // RSS用に変換
         foreach ($arrNews as $key => $value) {