stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-10 09:19:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use stdClass to return the feed data. Just use an array.

Browse Source
This commit is contained in:
Tim Almdal
2009-06-14 12:38:57 -07:00
parent 76b89556fc
commit 8b7f7a2fbe
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/rss/controllers/rss.php
View File

@@ -28,12 +28,16 @@ class Rss_Controller extends Controller {
}
$feed = rss::feed_data($method, ($page - 1) * self::$page_size, self::$page_size, $id);
if ($feed->max_pages && $page > $feed->max_pages) {
url::redirect("$feed_uri?page={$feed->max_pages}");
$max_pages = $feed["max_pages"];
if ($max_pages && $page > $max_pages) {
url::redirect("$feed_uri?page={$max_pages}");
}
unset($feed["max_pages"]);
$view = new View(empty($feed->view) ? "feed.mrss" : $feed->view);
foreach ($feed->data as $field => $value) {
$view = new View(empty($feed["view"]) ? "feed.mrss" : $feed["view"]);
unset($feed["view"]);
foreach ($feed as $field => $value) {
$view->$field = $value;
}
$view->feed_link = url::abs_site($feed_uri);
@@ -43,7 +47,7 @@ class Rss_Controller extends Controller {
$view->previous_page_link = url::site("$feed_uri?page={$previous_page}");
}
if ($page < $feed->max_pages) {
if ($page < $max_pages) {
$next_page = $page + 1;
$view->next_page_link = url::site("$feed_uri?page={$next_page}");
}