Force users to delete the install folder

flx5 · flx5 · commit 73991a5ee8cd · 2015-04-01T01:54:23.000+02:00
diff --git a/global.php b/global.php
@@ -52,8 +52,8 @@
 
 header('Content-Type: text/html');
 
-if (is_dir(CWD . "installer") && file_exists(CWD . "inc/config.php")) {
-     #die("ERROR: YOU HAVE TO REMOVE THE installer folder BEFORE YOU WILL BE ABLE TO USE THIS!");
+if (is_dir(CWD . "installer") && file_exists(CWD . "inc/config.php") && !file_exists(CWD."dev.txt")) {
+     die("ERROR: YOU HAVE TO REMOVE THE installer folder BEFORE YOU WILL BE ABLE TO USE THIS!");
 }
 
 if (!file_exists(CWD . "inc/config.php") && !is_dir(CWD . "installer")) {

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@`
`52`	`52`
`53`	`53`	`header('Content-Type: text/html');`
`54`	`54`
`55`		`-if (is_dir(CWD . "installer") && file_exists(CWD . "inc/config.php")) {`
`56`		`- #die("ERROR: YOU HAVE TO REMOVE THE installer folder BEFORE YOU WILL BE ABLE TO USE THIS!");`
	`55`	`+if (is_dir(CWD . "installer") && file_exists(CWD . "inc/config.php") && !file_exists(CWD."dev.txt")) {`
	`56`	`+ die("ERROR: YOU HAVE TO REMOVE THE installer folder BEFORE YOU WILL BE ABLE TO USE THIS!");`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if (!file_exists(CWD . "inc/config.php") && !is_dir(CWD . "installer")) {`