diff options
author | Andrew Dolgov <[email protected]> | 2013-03-20 22:05:49 -0700 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-03-20 22:05:49 -0700 |
commit | 5b0aec17e9359818e6a9d3161d8539d6ed7a4f70 (patch) | |
tree | 5c3adbffd822dbbaa7b763c039135a8e644a9a6d /classes/pref/filters.php | |
parent | 4e4048024a2007527eaf713408c03e83f319b4ed (diff) | |
parent | ca5d9be49fb6f9cf06ebf8e305c4c1e290f710da (diff) |
Merge pull request #63 from Joschasa/master
Remove deprecated stuff
Diffstat (limited to 'classes/pref/filters.php')
-rw-r--r-- | classes/pref/filters.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 20abae1d0..1921f2b97 100644 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -47,7 +47,7 @@ class Pref_Filters extends Handler_Protected { $feed_title = getFeedTitle($this->link, $feed); $qfh_ret = queryFeedHeadlines($this->link, -4, 30, "", false, false, false, - false, "date_entered DESC", 0, $_SESSION["uid"], $filter); + "date_entered DESC", 0, $_SESSION["uid"], $filter); $result = $qfh_ret[0]; @@ -370,9 +370,9 @@ class Pref_Filters extends Handler_Protected { $result = db_query($this->link, "SELECT description FROM ttrss_filter_types WHERE id = ".(int)$rule["filter_type"]); - $match_on = db_fetch_result($result, 0, "description"); + $filter_type = db_fetch_result($result, 0, "description"); - return T_sprintf("%s on %s in %s", strip_tags($rule["reg_exp"]), $match_on, $feed); + return T_sprintf("%s on %s in %s", strip_tags($rule["reg_exp"]), $filter_type, $feed); } function printRuleName() { |