From c211b7c4352e87e1ceefcce715e0b0aa7841f997 Mon Sep 17 00:00:00 2001
From: Kirk Mayo <textagroup@gmail.com>
Date: Sun, 4 Mar 2012 21:01:12 +1300
Subject: [PATCH] Added some simple code to show the location of the loaded
 php.ini file when php configuration or file permision errors exist

---
 dev/install/config-form.html | 3 +++
 dev/install/install.php5     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/dev/install/config-form.html b/dev/install/config-form.html
index a767badd6..e03cd794c 100644
--- a/dev/install/config-form.html
+++ b/dev/install/config-form.html
@@ -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">
diff --git a/dev/install/install.php5 b/dev/install/install.php5
index 6b3f84e7e..ff1b926a0 100644
--- a/dev/install/install.php5
+++ b/dev/install/install.php5
@@ -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) {