From 32a5e3444dc0cfc1c8045586b4582494853a647c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 27 Dec 2010 15:45:28 +0300
Subject: rename USE_CURL_FOR_ICONS to USE_CURL

---
 sanity_check.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'sanity_check.php')

diff --git a/sanity_check.php b/sanity_check.php
index a33b7c19e..567be65ee 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -41,8 +41,8 @@
 		exit;
 	}
 
-	if (USE_CURL_FOR_ICONS && ! function_exists("curl_init")) {
-		print "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP 
+	if (USE_CURL && ! function_exists("curl_init")) {
+		print "<b>Fatal Error</b>: You have enabled USE_CURL, but your PHP 
 			doesn't seem to support CURL functions.";
 		exit;
 	} 
@@ -138,6 +138,10 @@
 		$err_msg = "php.ini: Safe mode is not supported. If you wish to continue, remove this test from sanity_check.php and proceeed at your own risk. Please note that your bug reports will not be accepted or reviewed.";
 	}
 
+	if (defined('USE_CURL_FOR_ICONS')) {
+		$err_msg = "config: USE_CURL_FOR_ICONS has been renamed to USE_CURL.";
+	}
+
 	if ($err_msg) {
 		print "<b>Fatal Error</b>: $err_msg\n";
 		exit;
-- 
cgit v1.2.3-54-g00ecf