From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 10 Jul 2012 11:24:04 +0000 (+0400)
Subject: do not perform sanity checks on each backend request
X-Git-Tag: 1.6.0~189
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=545ca067895c841e265d1bc79484235b6cf900b3;p=tt-rss.git

do not perform sanity checks on each backend request
---

diff --git a/backend.php b/backend.php
index efc3793d..0b0fdba4 100644
--- a/backend.php
+++ b/backend.php
@@ -39,7 +39,6 @@
 
 	require_once "functions.php";
 	require_once "sessions.php";
-	require_once "sanity_check.php";
 	require_once "config.php";
 	require_once "db.php";
 	require_once "db-prefs.php";
@@ -125,12 +124,12 @@
 		5 => __("Power User"),
 		10 => __("Administrator"));
 
-	$error = sanity_check($link);
+	#$error = sanity_check($link);
 
-	if ($error['code'] != 0 && $op != "logout") {
-		print json_encode(array("error" => $error));
-		return;
-	}
+	#if ($error['code'] != 0 && $op != "logout") {
+	#	print json_encode(array("error" => $error));
+	#	return;
+	#}
 
 	function __autoload($class) {
 		$file = "classes/".strtolower(basename($class)).".php";
diff --git a/include/functions.php b/include/functions.php
index c98de261..a3de2461 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,4 +1,7 @@
 <?php
+	define('EXPECTED_CONFIG_VERSION', 25);
+	define('SCHEMA_VERSION', 92);
+
 	date_default_timezone_set('UTC');
 	if (defined('E_DEPRECATED')) {
 		error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 039a36ca..80ca7822 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -1,6 +1,4 @@
 <?php
-	require_once "functions.php";
-
 	function initial_sanity_check($link) {
 
 		$errors = array();
@@ -9,10 +7,6 @@
 			array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
 		} else {
 
-			define('EXPECTED_CONFIG_VERSION', 25);
-			define('SCHEMA_VERSION', 92);
-
-			require_once "config.php";
 			require_once "sanity_config.php";
 
 			if (function_exists('posix_getuid') && posix_getuid() == 0) {
@@ -20,7 +14,7 @@
 			}
 
 			if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
-				$array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
+				array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
 			}
 
 			$purifier_cache_dir = CACHE_DIR . "/htmlpurifier";