stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-23 07:15:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
max_page, just return an empty feed.
This commit is contained in:
Tim Almdal
2009-03-09 15:10:22 +00:00
parent b9ee37f30e
commit 83563ac91a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/rss/controllers/rss.php
+4 -6
View File
@@ -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");
}