diff options
| author | Richard Beales <[email protected]> | 2013-03-21 07:04:54 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-21 07:04:54 +0000 |
| commit | f1fdfbea433c834ae7f09b4ef23f23d5efa069d4 (patch) | |
| tree | 0b0b359f14767a9e2dea02a79f70de2bb30dda67 /classes/pref | |
| parent | 77accf45df3072bf0e3fe1e919bb75fc14313119 (diff) | |
| parent | b74c51342896f4f01a742dcad82fc8afa753c036 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'classes/pref')
| -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() { |