edit filter dialog: code cleanup

[tt-rss.git] / modules / pref-filters.php

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 5d4b60bc40525e976d0cd6eb108bfd1993b3fe7e..168afb82081ce4d0be6b3afd6fd42c20dc7f96d8 100644 (file)
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -244,10 +244,8 @@
 
                        print "<div class=\"dlgButtons\">";
 
-                       $reg_exp = htmlspecialchars($reg_exp, ENT_QUOTES); // second escaping seems to be needed for javascript
-
                        print "<div style=\"float : left\">";
-                       print "<button dojoType=\"dijit.form.Button\" onclick='return removeFilter($filter_id, \"$reg_exp\")'>".
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').removeFilter()\">".
                                __('Remove')."</button>";
                        print "</div>";
 
@@ -316,6 +314,7 @@
                        foreach ($ids as $id) {
                                db_query($link, "DELETE FROM ttrss_filters WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
                        }
+                       return;
                }
 
                if ($subop == "add") {