From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Sat, 20 Feb 2016 09:06:47 +0000 (+0300)
Subject: rewrite_relative_url: only skip urls like magnet: instead of everything with :
X-Git-Tag: 16.3~22
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=94d425fe4a21d41737fe656d9c54c38775fbd132;p=tt-rss.git

rewrite_relative_url: only skip urls like magnet: instead of everything with :
---

diff --git a/include/functions2.php b/include/functions2.php
index ed22a062..811c72ee 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -2048,15 +2048,15 @@
 	 * @return string Absolute URL
 	 */
 	function rewrite_relative_url($url, $rel_url) {
-		if (strpos($rel_url, ":") !== false) {
-			return $rel_url;
-		} else if (strpos($rel_url, "://") !== false) {
+		if (strpos($rel_url, "://") !== false) {
 			return $rel_url;
 		} else if (strpos($rel_url, "//") === 0) {
 			# protocol-relative URL (rare but they exist)
 			return $rel_url;
-		} else if (strpos($rel_url, "/") === 0)
-		{
+		} else if (preg_match("/^[a-z]+:/i", $rel_url)) {
+			# magnet:, feed:, etc
+			return $rel_url;
+		} else if (strpos($rel_url, "/") === 0) {
 			$parts = parse_url($url);
 			$parts['path'] = $rel_url;