From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Mar 2013 05:15:59 +0000 (+0400)
Subject: only use geturl() if in safe mode
X-Git-Tag: 1.7.5~86
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b799dc8b0d540d671a7f9c4f1202d428692367c9;p=tt-rss.git

only use geturl() if in safe mode
---

diff --git a/include/functions.php b/include/functions.php
index e66ec073..3b73ed5f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -286,8 +286,12 @@
 		global $fetch_last_error;
 
 		if (function_exists('curl_init') && !ini_get("open_basedir")) {
-			//$ch = curl_init($url);
-			$ch = curl_init(geturl($url));
+
+			if (ini_get("safe_mode")) {
+				$ch = curl_init(geturl($url));
+			} else {
+				$ch = curl_init($url);
+			}
 
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : 15);
 			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : 45);