Merge branch 'master' into tiny-oop

1 files changed, 6 insertions, 0 deletions

diff --git a/index.php b/index.php
index 5b5560a9a..76b1d13cf 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";