Pulled latest source from upstream.

2 files changed, 10 insertions, 3 deletions

diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 7aa007cb..958f2f3d 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -38,7 +38,8 @@ class comment_Core {
       ->error_messages("invalid", t("You must enter a valid email address"));
     $group->input("url")
       ->label(t("Website (hidden)"))
-      ->id("g-url");
+      ->id("g-url")
+      ->error_messages("url", t("You must enter a valid url"));
     $group->textarea("text")
       ->label(t("Comment"))
       ->id("g-text")
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 26d98d21..cc4180bf 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -57,13 +57,19 @@ class comment_rss_Core {
               "thumb_height" => $item->thumb_height,
               "thumb_width" => $item->thumb_width,
               "item_uri" => url::abs_site("{$item->type}s/$item->id"),
-              "title" => html::purify($item->title),
+              "title" => (
+                ($item->id == item::root()->id) ?
+                html::purify($item->title) :
+                t("%site_title - %item_title",
+                  array("site_title" => item::root()->title,
+                        "item_title" => $item->title))),
               "author" => html::clean($comment->author_name())),
         ArrayObject::ARRAY_AS_PROPS);
     }
 
     $feed->max_pages = ceil($comments->count_all() / $limit);
-    $feed->title = htmlspecialchars(t("Recent Comments"));
+    $feed->title = html::purify(t("%site_title - Recent Comments",
+                                 array("site_title" => item::root()->title)));
     $feed->uri = url::abs_site("albums/" . (empty($id) ? "1" : $id));
     $feed->description = t("Recent comments");