config: replace confusing option ENABLE_SIMPLEPIE with DEFAULT_UPDATE_METHOD; bump config version

1 files changed, 10 insertions, 1 deletions

diff --git a/sanity_check.php b/sanity_check.php
index d2f0e3177..b0d7477c7 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -1,7 +1,7 @@
 <?php
 	require_once "functions.php";
 
-	define('EXPECTED_CONFIG_VERSION', 18);
+	define('EXPECTED_CONFIG_VERSION', 19);
 	define('SCHEMA_VERSION', 66);
 
 	if (!file_exists("config.php")) {
@@ -91,6 +91,15 @@
 
 	}
 
+	if (defined('ENABLE_SIMPLEPIE')) {
+		$err_msg = "config: ENABLE_SIMPLEPIE is obsolete and replaced with DEFAULT_UPDATE_METHOD. Please adjust your config.php.";
+	}
+
+	if (!defined('DEFAULT_UPDATE_METHOD') || (DEFAULT_UPDATE_METHOD != 0 &&
+			DEFAULT_UPDATE_METHOD != 1)) {
+		$err_msg = "config: DEFAULT_UPDATE_METHOD should be either 0 or 1.";		
+	}
+
 	if ($err_msg) {
 		print "<b>Fatal Error</b>: $err_msg\n";
 		exit;