valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pref-feeds editor preserves cat_id when categories are disabled, fix feed order in editor

This commit is contained in:
Andrew Dolgov 2006-06-08 06:30:42 +01:00
parent 6e69e9c25d
commit a2db6a4a9b
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend.php
View File

@ -1567,21 +1567,25 @@
$private = checkbox_to_sql_bool(db_escape_string($_POST["private"])); $private = checkbox_to_sql_bool(db_escape_string($_POST["private"]));
$rtl_content = checkbox_to_sql_bool(db_escape_string($_POST["rtl_content"])); $rtl_content = checkbox_to_sql_bool(db_escape_string($_POST["rtl_content"]));
if ($cat_id && $cat_id != 0) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
$category_qpart = "cat_id = '$cat_id'"; if ($cat_id && $cat_id != 0) {
$category_qpart = "cat_id = '$cat_id',";
} else {
$category_qpart = 'cat_id = NULL,';
}
} else { } else {
$category_qpart = 'cat_id = NULL'; $category_qpart = "";
} }
if ($parent_feed && $parent_feed != 0) { if ($parent_feed && $parent_feed != 0) {
$parent_qpart = "parent_feed = '$parent_feed'"; $parent_qpart = "parent_feed = '$parent_feed',";
} else { } else {
$parent_qpart = 'parent_feed = NULL'; $parent_qpart = 'parent_feed = NULL,';
} }
$result = db_query($link, "UPDATE ttrss_feeds SET $result = db_query($link, "UPDATE ttrss_feeds SET
$category_qpart, $category_qpart
$parent_qpart, $parent_qpart
title = '$feed_title', feed_url = '$feed_link', title = '$feed_title', feed_url = '$feed_link',
update_interval = '$upd_intl', update_interval = '$upd_intl',
purge_interval = '$purge_intl', purge_interval = '$purge_intl',
@ -1798,6 +1802,12 @@
$search_qpart = ""; $search_qpart = "";
} }
if (get_pref($link, 'ENABLE_FEED_CATS')) {
$order_by_qpart = "category,$feeds_sort,title";
} else {
$order_by_qpart = "$feeds_sort,title";
}
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
F1.id, F1.id,
F1.title, F1.title,
@ -1817,7 +1827,7 @@
ON (F1.cat_id = C1.id) ON (F1.cat_id = C1.id)
WHERE WHERE
$search_qpart F1.owner_uid = '".$_SESSION["uid"]."' $search_qpart F1.owner_uid = '".$_SESSION["uid"]."'
ORDER by category,$feeds_sort,title"); ORDER by $order_by_qpart");
if (db_num_rows($result) != 0) { if (db_num_rows($result) != 0) {