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

Merge remote-tracking branch 'upstream/master' into misc_fixes

Browse Source
This commit is contained in:
Sean Harvey 2012-03-05 13:18:40 +13:00
commit 686f7b08e4
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/install/config-form.html
View File

@ -34,6 +34,9 @@
You aren't currently able to install the software. Please <a href="#requirements">see below</a> for details.<br>
If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/doku.php?id=server-requirements">server requirements wiki page</a>.
</p>
<?php if (isset($phpIniLocation)) { ?>
<p>Your php.ini file is located at <?php echo $phpIniLocation; ?></p>
<?php } ?>
<?php } else { ?>
<?php if($alreadyInstalled) { ?>
<div class="warning">

6
dev/install/install.php5
View File

@ -160,6 +160,12 @@ if($req->isIIS()) {
if($req->hasErrors()) {
$hasErrorOtherThanDatabase = true;
if ( function_exists('php_ini_loaded_file')) {
// show the location of the php.ini if any issues exist
$phpIniLocation = php_ini_loaded_file();
} else {
$phpIniLocation = null;
}
}
if($databaseConfig) {