summaryrefslogtreecommitdiff
path: root/modules/rss
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2012-05-12 13:06:18 +0000
committerNathan Kinkade <nath@nkinka.de>2012-05-12 13:06:18 +0000
commitf5098f54b8279f468d94747b1156e15ea05d6d25 (patch)
tree2ecfb6663887ffbc72de8f231864b6c78bd62640 /modules/rss
parenta13fd7f373f3718037a2ce90a3cb408f24856602 (diff)
parentd1390bd87db1a7e59bbd72f5991fbbc6374c98b4 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/rss')
-rw-r--r--modules/rss/controllers/rss.php2
-rw-r--r--modules/rss/views/feed.mrss.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 799ba989..288bf635 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -50,7 +50,7 @@ class Rss_Controller extends Controller {
unset($feed->view);
$view->feed = $feed;
- $view->pub_date = date("D, d M Y H:i:s T");
+ $view->pub_date = date("D, d M Y H:i:s O");
$feed->uri = url::abs_site(url::merge($_GET));
if ($page > 1) {
diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index 3f0010bb..b609a541 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -25,7 +25,7 @@
<title><?= html::purify($item->title) ?></title>
<link><?= url::abs_site("{$item->type}s/{$item->id}") ?></link>
<guid isPermaLink="true"><?= url::abs_site("{$item->type}s/{$item->id}") ?></guid>
- <pubDate><?= date("D, d M Y H:i:s T", $item->created); ?></pubDate>
+ <pubDate><?= date("D, d M Y H:i:s O", $item->created); ?></pubDate>
<description><?= html::purify($item->description) ?></description>
<content:encoded>
<![CDATA[