diff options
-rw-r--r-- | classes/feeds.php | 4 | ||||
-rw-r--r-- | include/functions.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index c3b20df97..a40fbf1d9 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -154,7 +154,7 @@ class Feeds extends Handler_Protected { }
}
- if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
+ if (is_numeric($feed) && $feed > 0) {
$result = db_query($this->link, "SELECT rtl_content FROM ttrss_feeds
WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
@@ -806,7 +806,7 @@ class Feeds extends Handler_Protected { set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);
set_pref($this->link, "_DEFAULT_INCLUDE_CHILDREN", $include_children);
- if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
+ if (!$cat_view && is_numeric($feed) && $feed > 0) {
db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()
WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
}
diff --git a/include/functions.php b/include/functions.php index 1ee334fa9..140d534fd 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2336,7 +2336,7 @@ $query_strategy_part = "ttrss_entries.id > 0"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; /* tags */ - } else if (preg_match("/^-?[0-9][0-9]*$/", $feed) == false) { + } else if (!is_numeric($feed)) { $query_strategy_part = "ttrss_entries.id > 0"; $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,"; @@ -2496,7 +2496,7 @@ $content_query_part = "content as content_preview,"; - if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) { + if (is_numeric($feed)) { if ($feed >= 0) { $feed_kind = "Feeds"; |