public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-16 08:45:57 +00:00
Code Issues Releases Wiki Activity

category search fixes, search dialog now searches in category view

Browse Source
This commit is contained in:
Andrew Dolgov
2006-08-01 05:13:48 +01:00
parent 59e2aab468
commit 0a6c4846cd
5 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
functions.php
View File

@@ -1972,7 +1972,7 @@
OR UPPER(ttrss_entries.content) LIKE UPPER('%$k%'))");
}
$search_query_part = implode("AND", $query_keywords) . "AND";
$search_query_part = implode("AND", $query_keywords) . " AND ";
} else if ($match_on == "title") {
@@ -1980,7 +1980,7 @@
array_push($query_keywords, "(UPPER(ttrss_entries.title) LIKE UPPER('%$k%'))");
}
$search_query_part = implode("AND", $query_keywords) . "AND";
$search_query_part = implode("AND", $query_keywords) . " AND ";
} else if ($match_on == "content") {
@@ -1988,7 +1988,7 @@
array_push($query_keywords, "(UPPER(ttrss_entries.content) LIKE UPPER('%$k%'))");
}
$search_query_part = implode("AND", $query_keywords) . "AND";
$search_query_part = implode("AND", $query_keywords) . " AND ";
}
} else {
$search_query_part = "";
@@ -2032,10 +2032,17 @@
} else if ($feed >= 0 && $search && $search_mode == "this_cat") {
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$tmp_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE cat_id =
(SELECT cat_id FROM ttrss_feeds WHERE id = '$feed') AND id != '$feed'");
$tmp_result = false;
if ($cat_view) {
$tmp_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE cat_id = '$feed'");
} else {
$tmp_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE cat_id = (SELECT cat_id FROM ttrss_feeds
WHERE id = '$feed') AND id != '$feed'");
}
$cat_siblings = array();
@@ -2255,4 +2262,16 @@
}
function getCategoryTitle($link, $cat_id) {
$result = db_query($link, "SELECT title FROM ttrss_feed_categories WHERE
id = '$cat_id'");
if (db_num_rows($result) == 1) {
return db_fetch_result($result, 0, "title");
} else {
return "Uncategorized";
}
}
?>