mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-27 03:21:01 +00:00
Merge branch 'anno1337-dev' into dev
This commit is contained in:
commit
ebd6bf6007
3 changed files with 17 additions and 15 deletions
14
check_essentials.php
Normal file
14
check_essentials.php
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?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"');
|
||||
}
|
||||
}
|
|
@ -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');
|
||||
}
|
||||
|
||||
|
|
|
@ -9,8 +9,9 @@
|
|||
*/
|
||||
|
||||
define ('POCHE', '1.7.1');
|
||||
require 'check_setup.php';
|
||||
require 'check_essentials.php';
|
||||
require_once 'inc/poche/global.inc.php';
|
||||
require 'check_setup.php';
|
||||
|
||||
# Set error reporting level
|
||||
if (defined('ERROR_REPORTING')) {
|
||||
|
|
Loading…
Reference in a new issue