From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 25 Apr 2011 12:46:45 +0000 (+0400)
Subject: allow loading without allow_url_fopen when CURL is enabled (closes #336)
X-Git-Tag: 1.5.4~10
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=3ff62983526a3d3cf075c59bbfafe65fe9821d58;p=tt-rss.git

allow loading without allow_url_fopen when CURL is enabled (closes #336)
---

diff --git a/sanity_check.php b/sanity_check.php
index 7d040e54..89f1b345 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -119,8 +119,8 @@
 		$err_msg = "php.ini: open_basedir is not supported.";
 	}
 
-	if (!ini_get("allow_url_fopen")) {
-		$err_msg = "php.ini: allow_url_fopen is required.";
+	if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
+		$err_msg = "php.ini: either allow_url_fopen or CURL needs to be enabled.";
 	}
 
 	if (!function_exists("json_encode")) {