Merge branch 'otp' of fturco/tt-rss into master

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 58661994540f4bad520ee74909def6818a9e92c0..98507d361a7e076db3e47f06dd8ab2b4f4ce2862 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -557,7 +557,9 @@ class Feeds extends Handler_Protected {
 
                                        if ($highlight_words && count($highlight_words) > 0) {
                                                foreach ($highlight_words as $word) {
-                                                       $line["title"] = preg_replace("/(\Q$word\E)/i",
+                                                   $word = preg_quote($word, "/");
+
+                                                       $line["title"] = preg_replace("/($word)/i",
                                                                "<span class=\"highlight\">$1</span>", $line["title"]);
                                                }
                                        }
@@ -1269,6 +1271,7 @@ class Feeds extends Handler_Protected {
                                        if ($feed > 0) {
                                                $children = Feeds::getChildCategories($feed, $owner_uid);
                                                array_push($children, $feed);
+                                               $children = array_map("intval", $children);
 
                                                $children = join(",", $children);
 
@@ -1435,7 +1438,7 @@ class Feeds extends Handler_Protected {
                } else if ($n_feed >= 0) {
 
                        if ($n_feed != 0) {
-                               $match_part = "feed_id = '$n_feed'";
+                               $match_part = "feed_id = " . (int)$n_feed;
                        } else {
                                $match_part = "feed_id IS NULL";
                        }
@@ -1670,7 +1673,7 @@ class Feeds extends Handler_Protected {
 
                        $cat_feeds = array();
                        while ($line = $sth->fetch()) {
-                               array_push($cat_feeds, "feed_id = " . $line["id"]);
+                               array_push($cat_feeds, "feed_id = " . (int)$line["id"]);
                        }
 
                        if (count($cat_feeds) == 0) return 0;
@@ -1885,8 +1888,9 @@ class Feeds extends Handler_Protected {
                                        if ($include_children) {
                                                # sub-cats
                                                $subcats = Feeds::getChildCategories($feed, $owner_uid);
-
                                                array_push($subcats, $feed);
+                                               $subcats = array_map("intval", $subcats);
+
                                                $query_strategy_part = "cat_id IN (".
                                                        implode(",", $subcats).")";
 
@@ -2094,9 +2098,9 @@ class Feeds extends Handler_Protected {
                                                $sanity_interval_qpart
                                                $first_id_query_strategy_part ORDER BY $order_by LIMIT 1";
 
-                               if ($_REQUEST["debug"]) {
+                               /*if ($_REQUEST["debug"]) {
                                        print $query;
-                               }
+                               }*/
 
                                $res = $pdo->query($query);
 
@@ -2142,7 +2146,7 @@ class Feeds extends Handler_Protected {
                                        $query_strategy_part ORDER BY $order_by
                                        $limit_query_part $offset_query_part";
 
-                       if ($_REQUEST["debug"]) print $query;
+                       //if ($_REQUEST["debug"]) print $query;
 
                        $res = $pdo->query($query);