diff options
| author | Andrew Dolgov <[email protected]> | 2006-03-04 15:12:11 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2006-03-04 15:12:11 +0100 |
| commit | d0bb308e16e930ff66249da031d25ffcf7710773 (patch) | |
| tree | 536aca9bb599d18e62f731ec1447412ac35fddaf /backend.php | |
| parent | 019ce9f37f72bd3fbc941b92f0c98d542509466e (diff) | |
tag display now works
Diffstat (limited to 'backend.php')
| -rw-r--r-- | backend.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/backend.php b/backend.php index 04539d1b2..60399e31c 100644 --- a/backend.php +++ b/backend.php @@ -1140,7 +1140,7 @@ if ($subop == "MarkAllRead") { - if (preg_match("/^[0-9][0-9]*$/", $feed) != false) { + if (preg_match("/^[0-9][0-9]*$/", $feed) != false && $feed >= 0) { if ($cat_view) { @@ -1298,7 +1298,7 @@ if ($search && $search_mode == "All feeds") { $query_strategy_part = "ttrss_entries.id > 0"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; - } else if (preg_match("/^[0-9][0-9]*$/", $feed) == false) { + } else if (preg_match("/^-?[0-9][0-9]*$/", $feed) == false) { $query_strategy_part = "ttrss_entries.id > 0"; $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,"; @@ -1382,9 +1382,11 @@ if ($search && $search_mode == "All feeds") { $feed_title = "Global search results ($search)"; - } else if ($search && sprintf("%d", $feed) == 0) { + } else if ($search && preg_match('/^-?[0-9][0-9]*$/', $feed) == false) { $feed_title = "Feed search results ($search, $feed)"; - } else if ($feed >= 0) { + } else if (preg_match('/^-?[0-9][0-9]*$/', $feed) == false) { + $feed_title = $feed; + } else if (preg_match('/^-?[0-9][0-9]*$/', $feed) != false && $feed >= 0) { if ($cat_view) { @@ -1421,7 +1423,7 @@ print "<div id=\"headlinesContainer\">"; - if (preg_match("/^[0-9][0-9]*$/", $feed) != false) { + if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) { if ($feed >= 0) { $feed_kind = "Feeds"; |