createFilter: properly create type 7 filters

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index ca469d504ea40a54b3362c6476f16ac00c65fd73..f2e3832e2c0cd7eb4fca056d30284468fe5cecf0 100644 (file)
--- 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)