]> git.wh0rd.org Git - tt-rss.git/commitdiff
allow loading without allow_url_fopen when CURL is enabled (closes #336)
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 25 Apr 2011 12:46:45 +0000 (16:46 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 25 Apr 2011 12:46:45 +0000 (16:46 +0400)
sanity_check.php

index 7d040e54c197a8e97f6aa7ac76f9cc028ff5ab81..89f1b34594efa5755eefc9fc1afdd7289dc4b90c 100644 (file)
                $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")) {