3 files changed, 29 insertions, 2 deletions
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index c550ec68..4e99ad93 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -164,7 +164,7 @@ class Rss_Controller extends Controller {
     $comments = $orm->find_all(self::$page_size, ($page - 1) * self::$page_size);
     $max_pages = ceil($orm->count_last_query() / self::$page_size);
 
-    if ($page > $max_pages) {
+    if ($max_pages && $page > $max_pages) {
       url::redirect("rss/comments/{$item->id}?page=$max_pages");
     }
 
@@ -202,6 +202,6 @@ class Rss_Controller extends Controller {
     }
 
     rest::http_content_type(rest::RSS);
-        print $view;
+    print $view;
   }
 }
 \ No newline at end of file
diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php
index 2880baa5..84276a8c 100644
--- a/modules/rss/helpers/rss_theme.php
+++ b/modules/rss/helpers/rss_theme.php
@@ -29,4 +29,18 @@ class rss_theme_Core {
       return "<link rel=\"alternate\" type=\"" . rest::RSS . "\" href=\"$url\" />";
     }
   }
+
+  static function sidebar_blocks($theme) {
+    $block = new Block();
+    $block->css_id = "gRss";
+    $block->title = t("Available RSS Feeds");
+    $block->content = new View("rss_block.html");
+    $block->content->feeds = array(
+      t("New photos or movies") => url::abs_site("rss/updates"),
+      t("All new comments") => url::abs_site("rss/comments"),
+      sprintf(t("Comments on %s"),
+              $theme->item()->title) => url::abs_site("rss/comments/{$theme->item()->id}")
+    );
+    return $block;
+  }
 }
diff --git a/modules/rss/views/rss_block.html.php b/modules/rss/views/rss_block.html.php
new file mode 100644
index 00000000..10106af9
--- /dev/null
+++ b/modules/rss/views/rss_block.html.php
@@ -0,0 +1,13 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<ul id="gFeeds">
+<? foreach($feeds as $text => $url): ?>
+  <li style="clear: both;">
+    <span class="ui-icon-left">
+    <a href="<?= $url ?>">
+      <span class="ui-icon ui-icon-signal-diag"></span>
+      <?= $text ?>
+    </a>
+    </span>
+  </li>
+<? endforeach ?>
+</ul>
+\ No newline at end of file