Refactor feed code to use stdClass everywhere. Fix bugs in the

max-pages calculation code.  Move feed related data into the $feed
variable and only pass that to the view.

1 files changed, 8 insertions, 11 deletions

diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 80803dfd..29300d58 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Rss_Controller extends Controller {
-  public static $page_size = 30;
+  public static $page_size = 20;
 
   public function feed($method, $id=null) {
     $page = $this->input->get("page", 1);
@@ -28,28 +28,25 @@ class Rss_Controller extends Controller {
     }
 
     $feed = rss::feed_data($method, ($page - 1) * self::$page_size, self::$page_size, $id);
-    $max_pages = $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"]);
-    unset($feed["view"]);
+    $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);
+    $feed->uri = url::abs_site($feed_uri);
+    $view->feed = $feed;
 
     if ($page > 1) {
       $previous_page = $page - 1;
-      $view->previous_page_link = url::site("$feed_uri?page={$previous_page}");
+      $feed->previous_page_uri = url::site("$feed_uri?page={$previous_page}");
     }
 
     if ($page < $max_pages) {
       $next_page = $page + 1;
-      $view->next_page_link = url::site("$feed_uri?page={$next_page}");
+      $feed->next_page_uri = url::site("$feed_uri?page={$next_page}");
     }
 
     $view->pub_date = date("D, d M Y H:i:s T");