diff options
| author | justauser <[email protected]> | 2013-06-27 11:57:49 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-06-27 11:57:49 -0400 |
| commit | 7171f32dc5ace4f36e1e70605ae96ebdbdf25c4f (patch) | |
| tree | e998d4fca34cebe801c982d1d7bf8932adbf218a /classes/opml.php | |
| parent | 891e36f57e2e3955a4f13019e8fdc58fce826434 (diff) | |
| parent | fac096405338e0f46fa248320318436d862678fc (diff) | |
Merge remote-tracking branch 'origin' into hookhead
Conflicts:
classes/feeds.php
fix for merging up to the origin
Diffstat (limited to 'classes/opml.php')
| -rw-r--r-- | classes/opml.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/classes/opml.php b/classes/opml.php index c5d14cdde..e9a07bb52 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -190,6 +190,7 @@ class Opml extends Handler_Protected { } $tmp_line["cat_filter"] = sql_bool_to_bool($tmp_line["cat_filter"]); + $tmp_line["inverse"] = sql_bool_to_bool($tmp_line["inverse"]); unset($tmp_line["feed_id"]); unset($tmp_line["cat_id"]); @@ -363,9 +364,10 @@ class Opml extends Handler_Protected { $cat_filter = bool_to_sql_bool($rule["cat_filter"]); $reg_exp = $this->dbh->escape_string($rule["reg_exp"]); $filter_type = (int)$rule["filter_type"]; + $inverse = bool_to_sql_bool($rule["inverse"]); - $this->dbh->query("INSERT INTO ttrss_filters2_rules (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter) - VALUES ($feed_id, $cat_id, $filter_id, $filter_type, '$reg_exp', $cat_filter)"); + $this->dbh->query("INSERT INTO ttrss_filters2_rules (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter,inverse) + VALUES ($feed_id, $cat_id, $filter_id, $filter_type, '$reg_exp', $cat_filter,$inverse)"); } foreach ($filter["actions"] as $action) { |