diff options
Diffstat (limited to 'modules/pref-feeds.php')
| -rw-r--r-- | modules/pref-feeds.php | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index fae1fbe2f..36a0e4d32 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -702,8 +702,12 @@ if (file_exists($icons_dir . "/$id.ico")) { unlink($icons_dir . "/$id.ico"); } + + ccache_remove($link, $id, $_SESSION["uid"]); + } else { label_remove($link, -11-$id, $_SESSION["uid"]); + ccache_remove($link, -11-$id, $_SESSION["uid"]); } } } @@ -992,6 +996,9 @@ if ($num_feeds == 0) { db_query($link, "DELETE FROM ttrss_feed_categories WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]); + + ccache_remove($link, $id, $_SESSION["uid"], true); + } else { print format_warning(__("Unable to delete non empty feed categories.")); @@ -1369,26 +1376,28 @@ print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\"> <option value=\"facDefault\" selected>".__('Actions...')."</option> - <option disabled>--------</option> - <option style=\"color : #5050aa\" disabled>".__('Selection:')."</option> - <option value=\"facEdit\"> ".__('Edit')."</option>"; + <optgroup label=\"".__('Selection:')."\"> + <option value=\"facEdit\">".__('Edit')."</option>"; if (FORCE_ARTICLE_PURGE == 0) { print - "<option value=\"facPurge\"> ".__('Manual purge')."</option>"; + "<option value=\"facPurge\">".__('Manual purge')."</option>"; } print " - <option value=\"facClear\"> ".__('Clear feed data')."</option> - <option value=\"facRescore\"> ".__('Rescore articles')."</option> - <option value=\"facUnsubscribe\"> ".__('Unsubscribe')."</option>"; + <option value=\"facClear\">".__('Clear feed data')."</option> + <option value=\"facRescore\">".__('Rescore articles')."</option> + <option value=\"facUnsubscribe\">".__('Unsubscribe')."</option>"; + + print "</optgroup>"; if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "<option disabled>--------</option> - <option style=\"color : #5050aa\" disabled>".__('Other:')."</option> - <option value=\"facEditCats\"> ".__('Edit categories')." - </option>"; + print "<optgroup label=\"".__('Other:')."\"> + <option value=\"facEditCats\">".__('Edit categories')." + </option> + </optgroup>"; + } print "</select>"; |