diff options
author | Andrew Dolgov <[email protected]> | 2005-10-16 17:16:34 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2005-10-16 17:16:34 +0100 |
commit | 52b51244c167816c83ebee45e746433c881a3a8b (patch) | |
tree | 3cb46e01576cc908ea4e7ad85645d7a7c980da49 /backend.php | |
parent | 9cab3250d6d1f88bc22a06865dd63680d43d30ff (diff) |
global search, update TODO
Diffstat (limited to 'backend.php')
-rw-r--r-- | backend.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/backend.php b/backend.php index 7ade2fb67..6fe21b923 100644 --- a/backend.php +++ b/backend.php @@ -472,6 +472,8 @@ $search = $_GET["search"]; + $search_mode = $_GET["smode"]; + if ($search) { $search_query_part = "(upper(title) LIKE upper('%$search%') OR content LIKE '%$search%') AND"; @@ -514,7 +516,12 @@ $vfeed_query_part = ""; - if (sprintf("%d", $feed) == 0) { + // override query strategy and enable feed display when searching globally + if ($search_mode == "All feeds") { + $query_strategy_part = "id > 0"; + $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE + id = feed_id) as feed_title,"; + } else if (sprintf("%d", $feed) == 0) { $query_strategy_part = "ttrss_entries.id > 0"; $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,"; @@ -538,6 +545,7 @@ $query_strategy_part = "id > 0"; // dumb } + $order_by = "updated DESC"; // if ($feed < -10) { |