Changeset 18680 for branches/version-2_4-dev

Timestamp:

2010/06/09 15:02:19 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100609033204-9v6c1hs88howr749

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/default/rss/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Frss%2Findex.tpl
data/class/pages/rss/LC_Page_Rss.php 16192@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Frss%2FLC_Page_Rss.php

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100609060215-jxcdywi22et0dqbn

bzr:revno:

1955

bzr:revprop:branch-nick:

branches/version-2_4-dev

bzr:root:

branches/version-2_4-dev

bzr:text-parents:

data/Smarty/templates/default/rss/index.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/feature-module-update:17005
data/class/pages/rss/LC_Page_Rss.php ohkouchi@loop-az.jp-20100607063506-7aygam8pu7925183

bzr:timestamp:

2010-06-09 15:02:15.780999899 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-06-09T06:02:15.781000Z

Message:

merged r17921

• RSSの時間出力を修正(#363)

Location:

branches/version-2_4-dev/data

Files:

• Smarty/templates/default/rss/index.tpl (modified) (1 diff)
• class/pages/rss/LC_Page_Rss.php (modified) (3 diffs)

branches/version-2_4-dev/data/Smarty/templates/default/rss/index.tpl

@@ -47 +47 @@
             <title> <!--{ $arrNews[cnt].news_title|sf_mb_convert_encoding:$encode|escape }--> </title>
             <description><!--{$arrNews[cnt].news_comment|truncate:256|sf_mb_convert_encoding:$encode|escape}--></description>
-            <!--{* <pubDate><!--{"r"|sf_mktime:$arrNews[cnt].hour:$arrNews[cnt].minute:$arrNews[cnt].second:$arrNews[cnt].month:$arrNews[cnt].day:$arrNews[cnt].year}--></pubDate> *}-->
-            <pubDate><!--{$timestamp|escape}--></pubDate>
+            <pubDate><!--{$arrNews[cnt].news_date|escape}--></pubDate>
         </item>
     <!--{/section}-->

branches/version-2_4-dev/data/class/pages/rss/LC_Page_Rss.php

@@ -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:本文)
@@ -129 +115 @@
         $objQuery->setOrder($order);
         $arrNews = $objQuery->select($col,$from,$where);
+
+        // RSS用に変換
+        foreach (array_keys($arrNews) as $key) {
+            $row =& $arrNews[$key];
+            // 日付
+            $row['news_date'] = date(DATE_RFC822, strtotime($row['news_date']));
+        }
+
         return $arrNews;
     }