tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-03 06:38:51 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7641 from Sil3ntStorm/patch/display_errors

Browse Source 
Reintroduce checking against original php.ini values.
This commit is contained in:
Damian Mooyman 2017-11-28 17:36:50 +13:00 committed by GitHub
commit 62eb531164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Dev/Install/InstallRequirements.php
View File

@ -227,8 +227,9 @@ class InstallRequirements
/** /**
* Check everything except the database * Check everything except the database
*/ */
public function check() public function check($originalIni)
{ {
$this->originalIni = $originalIni;
$this->errors = []; $this->errors = [];
$isApache = $this->isApache(); $isApache = $this->isApache();
$isIIS = $this->isIIS(); $isIIS = $this->isIIS();

2
src/Dev/Install/install5.php
View File

@ -66,7 +66,7 @@ $theme = $config->getTheme($_REQUEST);
// Check requirements // Check requirements
$req = new InstallRequirements(); $req = new InstallRequirements();
$req->check(); $req->check($originalIni);
if ($req->isIIS()) { if ($req->isIIS()) {
$webserverConfigFile = 'web.config'; $webserverConfigFile = 'web.config';