diff options
author | Richard Beales <[email protected]> | 2013-03-21 07:04:54 +0000 |
---|---|---|
committer | Richard Beales <[email protected]> | 2013-03-21 07:04:54 +0000 |
commit | f1fdfbea433c834ae7f09b4ef23f23d5efa069d4 (patch) | |
tree | 0b0b359f14767a9e2dea02a79f70de2bb30dda67 /classes/handler/public.php | |
parent | 77accf45df3072bf0e3fe1e919bb75fc14313119 (diff) | |
parent | b74c51342896f4f01a742dcad82fc8afa753c036 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'classes/handler/public.php')
-rw-r--r-- | classes/handler/public.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php index 4a9b0c48e..dc1e10049 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -2,7 +2,7 @@ class Handler_Public extends Handler { private function generate_syndicated_feed($owner_uid, $feed, $is_cat, - $limit, $offset, $search, $search_mode, $match_on, + $limit, $offset, $search, $search_mode, $view_mode = false, $format = 'atom') { require_once "lib/MiniTemplator.class.php"; @@ -25,7 +25,7 @@ class Handler_Public extends Handler { $qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $is_cat, $search, $search_mode, - $match_on, "$date_sort_field DESC", $offset, $owner_uid, + "$date_sort_field DESC", $offset, $owner_uid, false, 0, false, true); $result = $qfh_ret[0]; @@ -314,7 +314,6 @@ class Handler_Public extends Handler { $offset = (int)db_escape_string($_REQUEST["offset"]); $search = db_escape_string($_REQUEST["q"]); - $match_on = db_escape_string($_REQUEST["m"]); $search_mode = db_escape_string($_REQUEST["smode"]); $view_mode = db_escape_string($_REQUEST["view-mode"]); @@ -338,7 +337,7 @@ class Handler_Public extends Handler { if ($owner_id) { $this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit, - $offset, $search, $search_mode, $match_on, $view_mode, $format); + $offset, $search, $search_mode, $view_mode, $format); } else { header('HTTP/1.1 403 Forbidden'); } |