From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 12 Dec 2011 11:19:34 +0000 (+0400)
Subject: fix 500 error on missing config.php
X-Git-Tag: 1.5.8~23
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9da0e4a2ff84b097cf436b2641fc056315278f55;p=tt-rss.git

fix 500 error on missing config.php
---

diff --git a/include/sanity_check.php b/include/sanity_check.php
index 3e5c0980..2769b4b5 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -1,15 +1,15 @@
 <?php
 	require_once "functions.php";
 
-	define('EXPECTED_CONFIG_VERSION', 23);
-	define('SCHEMA_VERSION', 86);
-
 	if (!file_exists("config.php")) {
 		print "<b>Fatal Error</b>: You forgot to copy
 		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
 		exit;
 	}
 
+	define('EXPECTED_CONFIG_VERSION', 23);
+	define('SCHEMA_VERSION', 86);
+
 	require_once "config.php";
 	require_once "sanity_config.php";
 
diff --git a/index.php b/index.php
index 5b5560a9..76b1d13c 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,10 @@
 <?php
+	if (!file_exists("config.php")) {
+		print "<b>Fatal Error</b>: You forgot to copy
+		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
+		exit;
+	}
+
 	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
 
 	require_once "functions.php";