From f3f54944436db742c8e70e16fc90f36fb5ad4c17 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 24 Jan 2010 19:23:29 +0300
Subject: [PATCH] filters: properly reset memcached on add/remove operations

---
 modules/pref-feeds.php   | 9 ++++-----
 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 0329a129..f6ab572f 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 50120a2e..5c71fcb0 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"]);
-- 
2.39.5