diff --git a/core/INSTALL.txt b/core/INSTALL.txt index 8609458617448da000d64c744b1715263e0e2181..9e313c9b8051ef37d76568255dca071776990b27 100644 --- a/core/INSTALL.txt +++ b/core/INSTALL.txt @@ -19,8 +19,7 @@ Drupal requires: - A web server with PHP support, for example: - Apache 2.0 (or greater) (http://httpd.apache.org/). - Nginx 1.1 (or greater) (http://www.nginx.com/). -- PHP 5.4.5 (or greater) (http://www.php.net/) or the version that ships with - Debian Wheezy (5.4.4-14) (https://www.debian.org/releases/wheezy/). +- PHP 5.4.5 (or greater) (http://www.php.net/). - One of the following databases: - MySQL 5.0.15 (or greater) (http://www.mysql.com/). - MariaDB 5.1.44 (or greater) (http://mariadb.org/). MariaDB is a fully diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 0ea383fe189053ad8c118ee971bfa8e1408bc1e2..207fddaeba516c8ee93eacff4d59bbc03d5bd45f 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -22,12 +22,8 @@ /** * Minimum supported version of PHP. - * - * Minimum version is 5.4.5, or 5.4.4-14+deb7u14 on Debian Wheezy. - * - * @see https://www.drupal.org/node/2267551. */ -define('DRUPAL_MINIMUM_PHP', PHP_VERSION == '5.4.4-14+deb7u14' ? '5.4.4' : '5.4.5'); +const DRUPAL_MINIMUM_PHP = '5.4.5'; /** * Minimum recommended value of PHP memory_limit. diff --git a/core/install.php b/core/install.php index 4fdda9ae8c99cff5f5887f8a5ed6e7d89a15aa72..e206dfb3374f096d78c2f6f26e0efce4de1569e5 100644 --- a/core/install.php +++ b/core/install.php @@ -21,7 +21,7 @@ // The minimum version is specified explicitly, as DRUPAL_MINIMUM_PHP is not // yet available. It is defined in bootstrap.inc, but it is not possible to // load that file yet as it would cause a fatal error on older versions of PHP. -if (version_compare(PHP_VERSION, '5.4.4-14+deb7u14') < 0 && version_compare(PHP_VERSION, '5.4.5') < 0) { +if (version_compare(PHP_VERSION, '5.4.5') < 0) { print 'Your PHP installation is too old. Drupal requires at least PHP 5.4.5. See the <a href="http://drupal.org/requirements">system requirements</a> page for more information.'; exit; } diff --git a/core/scripts/password-hash.sh b/core/scripts/password-hash.sh index fd55c6b8baca27262ba78c6f494e4f49f5c98a58..b1cfa2f9da5901cac50ec9e2b98824b479c346a8 100755 --- a/core/scripts/password-hash.sh +++ b/core/scripts/password-hash.sh @@ -15,7 +15,7 @@ return; } -if (version_compare(PHP_VERSION, '5.4.4-14+deb7u14') < 0 && version_compare(PHP_VERSION, '5.4.5') < 0) { +if (version_compare(PHP_VERSION, '5.4.5') < 0) { $version = PHP_VERSION; echo <<<EOF