From: Andrew Dolgov <fox@bah.spb.su>
Date: Sun, 18 Jan 2009 10:04:54 +0000 (+0100)
Subject: createFilter: properly create type 7 filters
X-Git-Tag: 1.3.0~88
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=db34a63e2a79f07e4f8c6c386b225e3662d604fd;p=tt-rss.git

createFilter: properly create type 7 filters
---

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index ca469d50..f2e3832e 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -232,6 +232,7 @@
 			$feed_id = db_escape_string($_GET["feed_id"]);
 			$action_id = db_escape_string($_GET["action_id"]); 
 			$action_param = db_escape_string($_GET["action_param"]); 
+			$action_param_label = db_escape_string($_GET["action_param_label"]); 
 			$inverse = checkbox_to_sql_bool(db_escape_string($_GET["inverse"]));
 
 			# for the time being, no other filters use params anyway...
@@ -245,6 +246,13 @@
 				$feed_id = sprintf("'%s'", db_escape_string($feed_id));
 			}
 
+			/* When processing 'assign label' filters, action_param_label dropbox
+			 * overrides action_param */
+
+			if ($action_id == 7) {
+				$action_param = $action_param_label;
+			}
+
 			$result = db_query($link,
 				"INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id,
 					action_id, action_param, inverse, filter_param)