From 0b879d690ad01092489c37e2d55c5c1be1bd4e69 Mon Sep 17 00:00:00 2001 From: Sil3ntStorm Date: Sun, 26 Nov 2017 01:36:40 +0100 Subject: [PATCH] Reintroduce checking against original php.ini values. Seems to have been accidentally removed in 806ffb934e32644ddefc0dfb470d76218bd39334 Fixes https://github.com/silverstripe/silverstripe-installer/issues/211 --- src/Dev/Install/InstallRequirements.php | 3 ++- src/Dev/Install/install5.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Dev/Install/InstallRequirements.php b/src/Dev/Install/InstallRequirements.php index 736603b95..6affcfd6f 100644 --- a/src/Dev/Install/InstallRequirements.php +++ b/src/Dev/Install/InstallRequirements.php @@ -227,8 +227,9 @@ class InstallRequirements /** * Check everything except the database */ - public function check() + public function check($originalIni) { + $this->originalIni = $originalIni; $this->errors = []; $isApache = $this->isApache(); $isIIS = $this->isIIS(); diff --git a/src/Dev/Install/install5.php b/src/Dev/Install/install5.php index a55be3f6e..d238e9259 100755 --- a/src/Dev/Install/install5.php +++ b/src/Dev/Install/install5.php @@ -66,7 +66,7 @@ $theme = $config->getTheme($_REQUEST); // Check requirements $req = new InstallRequirements(); -$req->check(); +$req->check($originalIni); if ($req->isIIS()) { $webserverConfigFile = 'web.config';