public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-16 01:25:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of git.fakecake.org:tt-rss

Browse Source 
Conflicts:
	classes/pref/filters.php
This commit is contained in:
Andrew Dolgov
2015-07-13 12:46:05 +03:00
parent c939dfc396 402073d6a1
commit 4f9a3c0e0f
12 changed files with 438 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
classes/pref/filters.php
View File

@@ -114,6 +114,7 @@ class Pref_Filters extends Handler_Protected {
$result = db_query("SELECT ttrss_entries.id,
ttrss_entries.title,
ttrss_feeds.id AS feed_id,
ttrss_feeds.title AS feed_title,
ttrss_feed_categories.id AS cat_id,
content,
link,
@@ -152,7 +153,7 @@ class Pref_Filters extends Handler_Protected {
checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
print "<td>";
foreach ($filter['rules'] as $rule) {
/*foreach ($filter['rules'] as $rule) {
$reg_exp = $rule['reg_exp'];
$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
@@ -161,7 +162,7 @@ class Pref_Filters extends Handler_Protected {
$content_preview = preg_replace("/($reg_exp)/i",
"<span class=\"highlight\">$1</span>", $content_preview);
}
}*/
print $line["title"];
print "&nbsp;(";