From: <tna...@us...> - 2009-03-09 15:10:27
|
Revision: 20327 http://gallery.svn.sourceforge.net/gallery/?rev=20327&view=rev Author: tnalmdal Date: 2009-03-09 15:10:22 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Fix for ticket #133: If $max_pages is zero don't try to redirect to max_page, just return an empty feed. Modified Paths: -------------- gallery3/trunk/modules/rss/controllers/rss.php Modified: gallery3/trunk/modules/rss/controllers/rss.php =================================================================== --- gallery3/trunk/modules/rss/controllers/rss.php 2009-03-09 14:38:25 UTC (rev 20326) +++ gallery3/trunk/modules/rss/controllers/rss.php 2009-03-09 15:10:22 UTC (rev 20327) @@ -22,9 +22,7 @@ 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 @@ ->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 @@ ->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 @@ $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"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |