Merge branch 'master' into hookhead

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index eb011b6db3c3d0b05a2ac3ecf360767fdd59abbe..556b8a8cdf0c3c99de569c744dca99fd6e8fa62d 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -2578,8 +2578,10 @@
                                }
                        }
 
+
                        $content_query_part = "content, content AS content_preview, cached_content, ";
 
+
                        if (is_numeric($feed)) {
 
                                if ($feed >= 0) {
@@ -3784,7 +3786,7 @@
         * @return string Absolute URL
         */
        function rewrite_relative_url($url, $rel_url) {
-               if (strpos($rel_url, "magnet:") === 0) {
+               if (strpos($rel_url, ":") !== false) {
                        return $rel_url;
                } else if (strpos($rel_url, "://") !== false) {
                        return $rel_url;
@@ -3954,6 +3956,7 @@
                        $reg_qpart = "REGEXP";
 
                foreach ($filter["rules"] AS $rule) {
+                       $rule['reg_exp'] = str_replace('/', '\/', $rule["reg_exp"]);
                        $regexp_valid = preg_match('/' . $rule['reg_exp'] . '/',
                                $rule['reg_exp']) !== FALSE;