Changeset 18758 for trunk/data/class/pages/rss/LC_Page_Rss.php

Timestamp:

2010/07/20 13:25:33 (14 years ago)

Author:

kajiwara

Message:

EC-CUBE Ver2.4.4 分コミット。詳細はこちら（ http://www.ec-cube.net/release/detail.php?release_id=223）

File:

• trunk/data/class/pages/rss/LC_Page_Rss.php (modified) (4 diffs)

trunk/data/class/pages/rss/LC_Page_Rss.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -69 +69 @@
         //新着情報をセット
         $this->arrNews = $arrNews;
-        $this->timestamp = SC_Utils_Ex::sf_mktime("r", $arrNews[0]['hour'], $arrNews[0]['minute'], $arrNews[0]['second'], $arrNews[0]['month'], $arrNews[0]['day'], $arrNews[0]['year']);
+        // XXX 2.4.3 以下の互換性確保
+        $this->timestamp = $arrNews[0]['news_date'];
 
         //店名をセット
@@ -104 +105 @@
         $col .= "     ,news_title ";                            //新着情報タイトル
         $col .= "     ,news_comment ";                          //新着情報本文
-
-        if (DB_TYPE == "pgsql") {
-            $col .= "     ,to_char(news_date, 'YYYY') AS YEAR ";    //日付(年)
-            $col .= "     ,to_char(news_date, 'MM') AS MONTH ";     //日付(月)
-            $col .= "     ,to_char(news_date, 'DD') AS DAY ";       //日付(日)
-            $col .= "     ,to_char(news_date, 'HH24') AS HOUR ";    //日付(時間)
-            $col .= "     ,to_char(news_date, 'MI') AS MINUTE ";    //日付(分)
-            $col .= "     ,to_char(news_date, 'SS') AS SECOND ";    //日付(秒)
-        }else if (DB_TYPE == "mysql") {
-            $col .= "     ,DATE_FORMAT(news_date, '%Y') AS YEAR ";      //日付(年)
-            $col .= "     ,DATE_FORMAT(news_date, '%m') AS MONTH ";     //日付(月)
-            $col .= "     ,DATE_FORMAT(news_date, '%d') AS DAY ";       //日付(日)
-            $col .= "     ,DATE_FORMAT(news_date, '%H') AS HOUR ";      //日付(時間)
-            $col .= "     ,DATE_FORMAT(news_date, '%i') AS MINUTE ";    //日付(分)
-            $col .= "     ,DATE_FORMAT(news_date, '%s') AS SECOND ";    //日付(秒)
-        }
+        $col .= "     ,news_date ";                             //新着情報日時
         $col .= "     ,news_url ";                              //新着情報URL
         $col .= "     ,news_select ";                           //新着情報の区分(1:URL、2:本文)
@@ -127 +113 @@
         $where = "del_flg = '0'";
         $order = "rank DESC";
-        $objQuery->setorder($order);
+        $objQuery->setOrder($order);
         $arrNews = $objQuery->select($col,$from,$where);
+
+        // RSS用に変換
+        foreach (array_keys($arrNews) as $key) {
+            $row =& $arrNews[$key];
+            // 日付
+            $row['news_date'] = date("r", strtotime($row['news_date']));
+        }
+
         return $arrNews;
     }