public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 22:15:56 +00:00
Code Issues Releases Wiki Activity

queryFeedHeadlines: move to array-based arguments, optionally check if first element changed when paginating

Browse Source
This commit is contained in:
Andrew Dolgov
2015-07-12 01:29:36 +03:00
parent 5f297a5c11
commit f5a0fb8b64
8 changed files with 186 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
classes/handler/public.php
View File

@@ -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>