summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2014-10-24 13:24:39 +0200
committerczaks <marcin@6irc.net>2014-10-24 13:24:39 +0200
commitbd6e5da09624c0e7e6b21141f76ef9418fb700d9 (patch)
tree3fa6d2113781097edf1d7a305e525e4651d935fe
parentdaad519b85463ce21600af22adae8207517f35c5 (diff)
parentfe196be3999432c79a0a5192614a9a69ba3e253f (diff)
Merge branch 'master' of github.com:vichan-devel/Tinyboard
-rw-r--r--README.md2
-rw-r--r--install.php14
2 files changed, 8 insertions, 8 deletions
diff --git a/README.md b/README.md
index 1a09fd41..06efae0a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Support and announcements: https://int.vichan.net/devel/
Requirements
------------
-1. PHP >= 5.3
+1. PHP >= 5.4 (we still try to keep compatibility with php 5.3 as much as possible)
2. MySQL/MariaDB server
3. [mbstring](http://www.php.net/manual/en/mbstring.installation.php)
4. [PHP GD](http://www.php.net/manual/en/intro.image.php)
diff --git a/install.php b/install.php
index 8b3815a2..2e050eee 100644
--- a/install.php
+++ b/install.php
@@ -623,6 +623,13 @@ if ($step == 0) {
),
array(
'category' => 'PHP',
+ 'name' => 'PHP &ge; 5.4',
+ 'result' => PHP_VERSION_ID >= 50400,
+ 'required' => false,
+ 'message' => 'vichan works best on PHP 5.4 or better.',
+ ),
+ array(
+ 'category' => 'PHP',
'name' => 'mbstring extension installed',
'result' => extension_loaded('mbstring'),
'required' => true,
@@ -672,13 +679,6 @@ if ($step == 0) {
),
array(
'category' => 'Image processing',
- 'name' => 'Imagick extension installed',
- 'result' => extension_loaded('imagick'),
- 'required' => false,
- 'message' => '(Optional) The PHP <a href="http://www.php.net/manual/en/imagick.installation.php">Imagick</a> (ImageMagick) extension is not installed. You may not use Imagick for better (and faster) image processing.',
- ),
- array(
- 'category' => 'Image processing',
'name' => '`convert` (command-line ImageMagick)',
'result' => $can_exec && shell_exec('which convert'),
'required' => false,