Merge branch 'master' of git@github.com:/gallery/gallery3

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 6e966bdb..7daf6170 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -52,9 +52,9 @@ class gallery_rss_Core {
         ->viewable()
         ->descendants($limit, $offset, "photo");
       $feed->max_pages = ceil($item->viewable()->descendants_count("photo") / $limit);
-      $feed->title = $item->title;
+      $feed->title = p::purify($item->title);
       $feed->link = url::abs_site("albums/{$item->id}");
-      $feed->description = $item->description;
+      $feed->description = nl2br(p::purify($item->description));
 
       return $feed;
     }