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

[tt-rss.git] / sanity_check.php

diff --git a/sanity_check.php b/sanity_check.php
index d2f0e31778862e8b41e7c21d7397ba2ddcc7bfd7..b0d7477c75be36164f6d99ccd55a2836334c9242 100644 (file)
--- 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;