From 9c67b1b829290e5e78cb7da90acf285d6cd5c48f Mon Sep 17 00:00:00 2001
From: Marc Wilhelm <marc@suxez.com>
Date: Tue, 22 Jul 2014 11:52:18 +0200
Subject: Split up check_setup.php into two files. The new file
 check_essentials.php takes care of stuff like the PHP version and is executed
 before the config files are included which are needed by check_setup. This
 patch addresses issue #773

---
 check_setup.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'check_setup.php')

diff --git a/check_setup.php b/check_setup.php
index 2b84a744..7e378b15 100644
--- a/check_setup.php
+++ b/check_setup.php
@@ -1,25 +1,12 @@
 <?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');
 }
 
 // Check if /db is writeable
-if (! is_writable('db')) {
+if (! is_writable('db') && STORAGE === 'sqlite') {
     die('The directory "db" must be writeable by your web server user');
 }
 
-- 
cgit v1.2.3


From 211068ce504c48ee95e742a12ec04f16f3988c6c Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Thu, 21 Aug 2014 17:17:36 +0300
Subject: vendor dir is not accessible before install, sqlite db dir write
 check moved into db class

---
 check_setup.php | 5 -----
 1 file changed, 5 deletions(-)
 mode change 100644 => 100755 check_setup.php

(limited to 'check_setup.php')

diff --git a/check_setup.php b/check_setup.php
old mode 100644
new mode 100755
index 7e378b15..cf02c34b
--- a/check_setup.php
+++ b/check_setup.php
@@ -5,11 +5,6 @@ if (! is_writable('cache')) {
     die('The directory "cache" 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
 if (is_dir('install')) {
     require('install/index.php');
-- 
cgit v1.2.3