Merge commit 'upstream/master'

2 files changed, 2 insertions, 1 deletions

diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php
index f09a4530..5d42caab 100644
--- a/modules/tag/helpers/tag_rss.php
+++ b/modules/tag/helpers/tag_rss.php
@@ -34,6 +34,8 @@ class tag_rss_Core {
       if (!$tag->loaded()) {
         throw new Kohana_404_Exception();
       }
+
+      $feed = new stdClass();
       $feed->children = $tag->items($limit, $offset, "photo");
       $feed->max_pages = ceil($tag->count / $limit);
       $feed->title = $tag->name;
diff --git a/modules/tag/helpers/tags_rest.php b/modules/tag/helpers/tags_rest.php
index ac0eb81d..f28be7b5 100644
--- a/modules/tag/helpers/tags_rest.php
+++ b/modules/tag/helpers/tags_rest.php
@@ -35,7 +35,6 @@ class tags_rest_Core {
         $query->or_where("edit_{$group->id}", "=", access::ALLOW);
       }
       $has_any_edit_perm = $query->close()->count_records();
-
       if (!$has_any_edit_perm) {
         access::forbidden();
       }