Mercurial > hg > rc2
diff installer/check.php @ 8:bf99236cc5cd default tip
try to recover from upgrade fail
author | Charlie Root |
---|---|
date | Sat, 29 Dec 2018 07:07:34 -0500 |
parents | 4681f974d28b |
children |
line wrap: on
line diff
--- a/installer/check.php Sat Dec 29 06:32:49 2018 -0500 +++ b/installer/check.php Sat Dec 29 07:07:34 2018 -0500 @@ -15,17 +15,18 @@ 'XML' => 'xml', 'JSON' => 'json', 'PDO' => 'PDO', + 'Multibyte' => 'mbstring', + 'OpenSSL' => 'openssl', ); $optional_php_exts = array( 'FileInfo' => 'fileinfo', 'Libiconv' => 'iconv', - 'Multibyte' => 'mbstring', - 'OpenSSL' => 'openssl', - 'Mcrypt' => 'mcrypt', 'Intl' => 'intl', 'Exif' => 'exif', 'LDAP' => 'ldap', + 'GD' => 'gd', + 'Imagick' => 'imagick', ); $required_libs = array( @@ -45,15 +46,12 @@ 'session.auto_start' => 0, 'mbstring.func_overload' => 0, 'suhosin.session.encrypt' => 0, - 'magic_quotes_runtime' => 0, - 'magic_quotes_sybase' => 0, ); $optional_checks = array( // required for utils/modcss.inc, should we require this? 'allow_url_fopen' => 1, 'date.timezone' => '-VALID-', - 'register_globals' => 0, // #1489157 ); $source_urls = array( @@ -63,7 +61,6 @@ 'FileInfo' => 'http://www.php.net/manual/en/book.fileinfo.php', 'Libiconv' => 'http://www.php.net/manual/en/book.iconv.php', 'Multibyte' => 'http://www.php.net/manual/en/book.mbstring.php', - 'Mcrypt' => 'http://www.php.net/manual/en/book.mcrypt.php', 'OpenSSL' => 'http://www.php.net/manual/en/book.openssl.php', 'JSON' => 'http://www.php.net/manual/en/book.json.php', 'DOM' => 'http://www.php.net/manual/en/book.dom.php', @@ -72,6 +69,8 @@ 'oci8' => 'http://www.php.net/manual/en/book.oci8.php', 'PDO' => 'http://www.php.net/manual/en/book.pdo.php', 'LDAP' => 'http://www.php.net/manual/en/book.ldap.php', + 'GD' => 'http://www.php.net/manual/en/book.image.php', + 'Imagick' => 'http://www.php.net/manual/en/book.imagick.php', 'pdo_mysql' => 'http://www.php.net/manual/en/ref.pdo-mysql.php', 'pdo_pgsql' => 'http://www.php.net/manual/en/ref.pdo-pgsql.php', 'pdo_sqlite' => 'http://www.php.net/manual/en/ref.pdo-sqlite.php', @@ -91,16 +90,10 @@ <h3>Checking PHP version</h3> <?php -define('MIN_PHP_VERSION', '5.3.7'); +define('MIN_PHP_VERSION', '5.4.0'); if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) { - if (PHP_MAJOR_VERSION != 5) { - $RCI->fail('Version', 'PHP5 is required, ' . PHP_VERSION . ' detected'); - } - else { - $RCI->pass('Version', 'PHP ' . PHP_VERSION . ' detected'); - } -} -else { + $RCI->pass('Version', 'PHP ' . PHP_VERSION . ' detected'); +} else { $RCI->fail('Version', 'PHP Version ' . MIN_PHP_VERSION . ' or greater is required ' . PHP_VERSION . ' detected'); } ?>