queryFeedHeadlines: move to array-based arguments, optionally check if first element...

[tt-rss.git] / classes / handler / public.php

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 74e837846e18ca0a3cefe94e34207f5b5392a83e..1bf0887011d0248ce8fcaa4da0334b0cdde1bf22 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -37,10 +37,31 @@ class Handler_Public extends Handler {
                        break;
                }
 
-               $qfh_ret = queryFeedHeadlines($feed,
+               /*$qfh_ret = queryFeedHeadlines($feed,
                        1, $view_mode, $is_cat, $search, false,
                        $date_sort_field, $offset, $owner_uid,
-                       false, 0, true, true, false, false, $start_ts);
+                       false, 0, true, true, false, false, $start_ts);*/
+
+               //function queryFeedHeadlines($feed,
+               // $limit, $view_mode, $cat_view, $search, $search_mode,
+               // $override_order = false, $offset = 0, $owner_uid = 0,
+               // $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false, $check_top_id = false) {
+
+               $params = array(
+                       "owner_uid" => $owner_uid,
+                       "feed" => $feed,
+                       "limit" => 1,
+                       "view_mode" => $view_mode,
+                       "cat_view" => $is_cat,
+                       "search" => $search,
+                       "override_order" => $date_sort_field,
+                       "include_children" => true,
+                       "ignore_vfeed_group" => true,
+                       "offset" => $offset,
+                       "start_ts" => $start_ts
+               );
+
+               $qfh_ret = queryFeedHeadlines($params);
 
                $result = $qfh_ret[0];
 
@@ -58,11 +79,26 @@ class Handler_Public extends Handler {
                        header("Last-Modified: $last_modified", true);
                }
 
-               $qfh_ret = queryFeedHeadlines($feed,
+               /*$qfh_ret = queryFeedHeadlines($feed,
                        $limit, $view_mode, $is_cat, $search, false,
                        $date_sort_field, $offset, $owner_uid,
-                       false, 0, true, true, false, false, $start_ts);
-
+                       false, 0, true, true, false, false, $start_ts);*/
+
+               $params = array(
+                       "owner_uid" => $owner_uid,
+                       "feed" => $feed,
+                       "limit" => $limit,
+                       "view_mode" => $view_mode,
+                       "cat_view" => $is_cat,
+                       "search" => $search,
+                       "override_order" => $date_sort_field,
+                       "include_children" => true,
+                       "ignore_vfeed_group" => true,
+                       "offset" => $offset,
+                       "start_ts" => $start_ts
+               );
+
+               $qfh_ret = queryFeedHeadlines($params);
 
                $result = $qfh_ret[0];
                $feed_title = htmlspecialchars($qfh_ret[1]);
@@ -496,7 +532,7 @@ class Handler_Public extends Handler {
                                        </div>
                                        <button type="submit"><?php echo __('Share') ?></button>
                                        <button onclick="return window.close()"><?php echo __('Cancel') ?></button>
-                                       </div>
+                                       </td>
 
                                </form>
                                </td></tr></table>