Fix for ticket #133: If $max_pages is zero don't try to redirect to

max_page, just return an empty feed.

1 files changed, 4 insertions, 6 deletions

diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 5ccfb18d..960140c7 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -22,9 +22,7 @@ class Rss_Controller extends Controller {
 
   public function albums($id) {
     $item = ORM::factory("item", $id);
-    if (!access::can("view", $item)) {
-      return Kohana::show_404();
-    }
+    access::required("view", $item);
 
     $page = $this->input->get("page", 1);
     if ($page < 1) {
@@ -36,7 +34,7 @@ class Rss_Controller extends Controller {
       ->descendants(self::$page_size, ($page - 1) * self::$page_size, "photo");
     $max_pages = ceil($item->viewable()->descendants_count("photo") / self::$page_size);
 
-    if ($page > $max_pages) {
+    if ($max_page && $page > $max_pages) {
       url::redirect("rss/albums/{$item->id}?page=$max_pages");
     }
 
@@ -77,7 +75,7 @@ class Rss_Controller extends Controller {
       ->find_all(self::$page_size, ($page - 1) * self::$page_size);
     $max_pages = ceil($items->count() / self::$page_size);
 
-    if ($page > $max_pages) {
+    if ($max_page && $page > $max_pages) {
       url::redirect("rss/updates?page=$max_pages");
     }
 
@@ -119,7 +117,7 @@ class Rss_Controller extends Controller {
     $children = $tag->items(self::$page_size, ($page - 1) * self::$page_size, "photo");
     $max_pages = ceil($tag->count / self::$page_size);
 
-    if ($page > $max_pages) {
+    if ($max_page && $page > $max_pages) {
       url::redirect("rss/tags/{$tag->id}?page=$max_pages");
     }