diff options
author | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
---|---|---|
committer | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
commit | d9c042c4c536f1afbf206aeea09b0b127b7b6418 (patch) | |
tree | 9d7ef18c6d9d4c8f8f4d1c9a5dbfceeb9fd5acf4 /classes/handler/public.php | |
parent | cf42b79120290ee5866136a0c4656e6999f06045 (diff) | |
parent | 4ca621a36016de1fbb5447e1c1de0b607ba94a7c (diff) |
Merge branch 'master' into patch-1
Conflicts:
locale/de_DE/LC_MESSAGES/messages.po
Diffstat (limited to 'classes/handler/public.php')
-rw-r--r-- | classes/handler/public.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php index e89318c6f..34d577441 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -39,11 +39,10 @@ class Handler_Public extends Handler { //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) { - $qfh_ret = queryFeedHeadlines($feed, 1, $view_mode, $is_cat, $search, $search_mode, $date_sort_field, $offset, $owner_uid, - false, 0, false, true, false, false, $start_ts); + false, 0, true, true, false, false, $start_ts); $result = $qfh_ret[0]; @@ -64,7 +63,7 @@ class Handler_Public extends Handler { $qfh_ret = queryFeedHeadlines($feed, $limit, $view_mode, $is_cat, $search, $search_mode, $date_sort_field, $offset, $owner_uid, - false, 0, false, true, false, false, $start_ts); + false, 0, true, true, false, false, $start_ts); $result = $qfh_ret[0]; |