'$entry_comments',
'$num_comments',
'$entry_author')");
+
+ $article_labels = array();
+
} else {
// we keep encountering the entry in feeds, so we need to
// update date_updated column so that we don't get horrible
db_query($link, "UPDATE ttrss_entries SET date_updated = NOW()
WHERE id = '$base_entry_id'");
+
+ $article_labels = get_article_labels($link, $base_entry_id, $owner_uid);
}
// now it should exist, if not - bad luck then
/* Collect article tags here so we could filter by them: */
$article_filters = get_article_filters($filters, $entry_title,
- strip_tags($entry_content), $entry_link, $entry_timestamp, $entry_author,
+ $entry_content, $entry_link, $entry_timestamp, $entry_author,
$entry_tags);
if ($debug_enabled) {
}
}
- $article_labels = get_article_labels($link, $entry_ref_id, $owner_uid);
-
if (find_article_filter($article_filters, "filter")) {
db_query($link, "COMMIT"); // close transaction in progress
continue;
$match = @preg_match("/$reg_exp/i", $title);
break;
case "content":
+ // we don't need to deal with multiline regexps
+ $content = preg_replace("/[\r\n\t]/", "", $content);
+
$match = @preg_match("/$reg_exp/i", $content);
break;
case "both":
- $match = (@preg_match("/$reg_exp/i", $title) || @preg_match("/$reg_exp/i", $title));
+ // we don't need to deal with multiline regexps
+ $content = preg_replace("/[\r\n\t]/", "", $content);
+
+ $match = (@preg_match("/$reg_exp/i", $title) || @preg_match("/$reg_exp/i", $content));
break;
case "link":
$match = @preg_match("/$reg_exp/i", $link);