4 files changed, 49 insertions, 5 deletions
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index d5aab84c..8b9634c5 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -7,7 +7,7 @@
          alt="<?= p::clean($comment->author_name()) ?>"
          width="32"
          height="32" />
-    <?= date("Y-M-d H:i:s", $comment->created) ?>
+    <?= gallery::date_time($comment->created) ?>
     <?= t("<a href=#>%author_name</a> said <em>%comment_text</em>",
         array("author_name" => p::clean($comment->author_name()),
                 "comment_text" => text::limit_words(p::clean($comment->text), 50))); ?>
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 79bdb1f3..e749fde0 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -117,7 +117,7 @@
       </td>
       <td>
         <div class="right">
-          <? $item = $comment->item(); ?>
+          <? $item = $comment->item() ?>
           <div class="gItem gPhoto">
             <a href="<?= $item->url() ?>">
               <? if ($item->has_thumb()): ?>
@@ -131,7 +131,7 @@
             </a>
           </div>
         </div>
-        <p><?= date("Y-M-d", $comment->created); ?></p>
+        <p><?= gallery::date($comment->created) ?></p>
         <?= p::clean($comment->text) ?>
       </td>
       <td>
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index 0337173b..ce52951b 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -8,8 +8,9 @@
            width="40"
            height="40" />
     </a>
-    <?= t("on ") . date("Y-M-d H:i:s", $comment->created) ?>
-    <a href="#"><?= p::clean($comment->author_name()) ?></a> <?= t("said") ?>
+    <?= t("on %date_time, %author_name said",
+          array("date_time" => gallery::date_time($comment->created),
+                "author_name" => p::clean($comment->author_name()))) ?>
   </p>
   <div>
     <?= p::clean($comment->text) ?>
diff --git a/modules/comment/views/comment.mrss.php b/modules/comment/views/comment.mrss.php
new file mode 100644
index 00000000..d2177026
--- /dev/null
+++ b/modules/comment/views/comment.mrss.php
@@ -0,0 +1,43 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? echo "<?xml version=\"1.0\" ?>" ?>
+<rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/"
+   xmlns:atom="http://www.w3.org/2005/Atom"
+   xmlns:content="http://purl.org/rss/1.0/modules/content/"
+   xmlns:fh="http://purl.org/syndication/history/1.0">
+  <channel>
+    <generator>gallery3</generator>
+    <title><?= p::clean($title) ?></title>
+    <link><?= $link ?></link>
+    <description><?= p::clean($description) ?></description>
+    <language>en-us</language>
+    <atom:link rel="self" href="<?= $feed_link ?>" type="application/rss+xml" />
+    <fh:complete/>
+    <? if (!empty($previous_page_link)): ?>
+    <atom:link rel="previous" href="<?= $previous_page_link ?>" type="application/rss+xml" />
+    <? endif ?>
+    <? if (!empty($next_page_link)): ?>
+    <atom:link rel="next" href="<?= $next_page_link ?>" type="application/rss+xml" />
+    <? endif ?>
+    <pubDate><?= $pub_date ?></pubDate>
+    <lastBuildDate><?= $pub_date ?></lastBuildDate>
+    <? foreach ($children as $child): ?>
+    <item>
+      <title><?= p::clean($child["title"]) ?></title>
+      <link><?= p::clean($child["item_link"]) ?></link>
+      <author><?= p::clean($child["author"]) ?></author>
+      <guid isPermaLink="true"><?= $child["item_link"] ?></guid>
+      <pubDate><?= $child["pub_date"] ?></pubDate>
+      <content:encoded>
+        <![CDATA[
+          <p><?= p::clean($child["text"]) ?></p>
+          <p>
+            <img alt="" src="<?= $child["thumb_url"] ?>"
+                 height="<?= $child["thumb_height"] ?>" width="<?= $child["thumb_width"] ?>" />
+            <br />
+          </p>
+        ]]>
+      </content:encoded>
+    </item>
+    <? endforeach ?>
+  </channel>
+</rss>