Merge branch 'dev' into refactor

Conflicts:
	check_setup.php
	index.php

1 files changed, 6 insertions, 15 deletions

diff --git a/check_setup.php b/check_setup.php
index eee5d24a..7e378b15 100644
--- a/check_setup.php
+++ b/check_setup.php
@@ -1,22 +1,13 @@
 <?php
-// PHP 5.3 minimum
-if (version_compare(PHP_VERSION, '5.3.3', '<')) {
-    die('This software require PHP 5.3.3 minimum');
-}
-
-// Short tags must be enabled for PHP < 5.4
-if (version_compare(PHP_VERSION, '5.4.0', '<')) {
 
-    if (! ini_get('short_open_tag')) {
-        die('This software require to have short tags enabled, check your php.ini => "short_open_tag = On"');
-    }
+// Check if /cache is writeable
+if (! is_writable('cache')) {
+    die('The directory "cache" must be writeable by your web server user');
 }
 
-$writableFolders = array('cache', 'db');
-foreach ($writableFolders as $folder) {
-    if (! is_writable($folder)) {
-        die('The directory "' . $folder . '" must be writeable by your web server user');
-    }
+// Check if /db is writeable
+if (! is_writable('db') && STORAGE === 'sqlite') {
+    die('The directory "db" must be writeable by your web server user');
 }
 
 // install folder still present, need to install wallabag