diff --git a/classes/pref/filters.php b/classes/pref/filters.php index f24d0a01b..e1c2e776d 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -52,10 +52,8 @@ class Pref_Filters extends Handler_Protected { $filter = array(); $filter["enabled"] = true; - $filter["match_any_rule"] = sql_bool_to_bool( - checkbox_to_sql_bool($_REQUEST["match_any_rule"])); - $filter["inverse"] = sql_bool_to_bool( - checkbox_to_sql_bool($_REQUEST["inverse"])); + $filter["match_any_rule"] = checkbox_to_sql_bool($_REQUEST["match_any_rule"]); + $filter["inverse"] = checkbox_to_sql_bool($_REQUEST["inverse"]); $filter["rules"] = array(); $filter["actions"] = array("dummy-action"); @@ -252,7 +250,7 @@ class Pref_Filters extends Handler_Protected { } else { - $where = sql_bool_to_bool($line["cat_filter"]) ? + $where = $line["cat_filter"] ? Feeds::getCategoryTitle($line["cat_id"]) : ($line["feed_id"] ? Feeds::getFeedTitle($line["feed_id"]) : __("All feeds")); @@ -260,13 +258,13 @@ class Pref_Filters extends Handler_Protected { # $where = $line["cat_id"] . "/" . $line["feed_id"]; - $inverse = sql_bool_to_bool($line["inverse"]) ? "inverse" : ""; + $inverse = $line["inverse"] ? "inverse" : ""; $rv .= "" . T_sprintf("%s on %s in %s %s", htmlspecialchars($line["reg_exp"]), $line["field"], $where, - sql_bool_to_bool($line["inverse"]) ? __("(inverse)") : "") . ""; + $line["inverse"] ? __("(inverse)") : "") . ""; } return $rv; @@ -335,7 +333,7 @@ class Pref_Filters extends Handler_Protected { $filter['name'] = $name[0]; $filter['param'] = $name[1]; $filter['checkbox'] = false; - $filter['enabled'] = sql_bool_to_bool($line["enabled"]); + $filter['enabled'] = $line["enabled"]; $filter['rules'] = $this->getfilterrules_concise($line['id']); if (!$filter_search || $match_ok) { @@ -364,9 +362,9 @@ class Pref_Filters extends Handler_Protected { if ($row = $sth->fetch()) { - $enabled = sql_bool_to_bool($row["enabled"]); - $match_any_rule = sql_bool_to_bool($row["match_any_rule"]); - $inverse = sql_bool_to_bool($row["inverse"]); + $enabled = $row["enabled"]; + $match_any_rule = $row["match_any_rule"]; + $inverse = $row["inverse"]; $title = htmlspecialchars($row["title"]); print "