diff options
| author | Andrew Dolgov <[email protected]> | 2010-01-24 19:23:29 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2010-01-24 19:23:29 +0300 |
| commit | f3f54944436db742c8e70e16fc90f36fb5ad4c17 (patch) | |
| tree | 90fea95b0954b020e0e48aea97476fc45e10fd7d /modules | |
| parent | b62f7265cc33490cbaf4dfa467b8bd49fd5c8a94 (diff) | |
filters: properly reset memcached on add/remove operations
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/pref-feeds.php | 9 | ||||
| -rw-r--r-- | modules/pref-filters.php | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 0329a1298..f6ab572fa 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -1192,8 +1192,8 @@ print "<button onclick=\"javascript:removeSelectedFeeds()\">" .__('Unsubscribe')."</button> "; -/* print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\"> - <option value=\"facDefault\" selected>".__('Other actions...')."</option>"; + print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\"> + <option value=\"facDefault\" selected>".__('More actions...')."</option>"; if (FORCE_ARTICLE_PURGE == 0) { print @@ -1202,10 +1202,9 @@ print " <option value=\"facClear\">".__('Clear feed data')."</option> - <option value=\"facRescore\">".__('Rescore articles')."</option> - <option value=\"facUnsubscribe\">".__('Unsubscribe')."</option>"; + <option value=\"facRescore\">".__('Rescore articles')."</option>"; - print "</select>"; */ + print "</select>"; /* if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { print " <input type=\"submit\" class=\"button\" diff --git a/modules/pref-filters.php b/modules/pref-filters.php index 50120a2e7..5c71fcb03 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -215,6 +215,8 @@ } if ($subop == "remove") { + + if ($memcache) $memcache->flush(); $ids = split(",", db_escape_string($_REQUEST["ids"])); @@ -224,7 +226,9 @@ } if ($subop == "add") { - + + if ($memcache) $memcache->flush(); + $regexp = db_escape_string(trim($_REQUEST["reg_exp"])); $filter_type = db_escape_string(trim($_REQUEST["filter_type"])); $feed_id = db_escape_string($_REQUEST["feed_id"]); |