filters: properly reset memcached on add/remove operations

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 0329a129893fd8127ab8f3474bd809c2cbe2bec8..f6ab572fa8c9849b62b7f574f922f8c3bce68951 100644 (file)
--- 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 50120a2e710c442f590f00595a0b67c1b5c1817f..5c71fcb03f8d6b90e2742b4e32a5dc444b308a88 100644 (file)
--- 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"]);