From 68aaae8cc06e2c45c6b9af4a4bf0f646ffe292a7 Mon Sep 17 00:00:00 2001
From: Sean Harvey <halkyon@gmail.com>
Date: Sat, 31 Mar 2012 20:09:45 +1300
Subject: [PATCH] MINOR Update docs and version checking for PHP 5.3+

---
 _config.php                    | 2 --
 dev/install/install.php        | 9 ++++-----
 dev/install/install.php5       | 2 +-
 dev/install/php5-required.html | 7 +++----
 main.php                       | 7 +++++--
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/_config.php b/_config.php
index fae926994..abecc340e 100644
--- a/_config.php
+++ b/_config.php
@@ -42,8 +42,6 @@ Director::addRules(20, array(
 Object::useCustomClass('SSDatetime', 'SS_Datetime', true);
 Object::useCustomClass('Datetime',   'SS_Datetime', true);
 
-
-
 /**
  * The root directory of TinyMCE
  */
diff --git a/dev/install/install.php b/dev/install/install.php
index 65030accd..20c86a13d 100644
--- a/dev/install/install.php
+++ b/dev/install/install.php
@@ -1,26 +1,25 @@
 <?php
 
-
 /************************************************************************************
  ************************************************************************************
  **                                                                                **
  **  If you can read this text in your browser then you don't have PHP installed.  **
- **  Please install PHP 5.2 or higher, preferably PHP 5.3.                         **
+ **  Please install PHP 5.3 or higher.                                             **
  **                                                                                **
  ************************************************************************************
  ************************************************************************************/
 
 /**
- * PHP version check. Make sure we've got at least PHP 5.2 in the most friendly way possible
+ * PHP version check. Make sure we've got at least PHP 5.3 in the most friendly way possible
  */
 
 $majorVersion = strtok(phpversion(),'.');
 $minorVersion = strtok('.');
 
-if($majorVersion < 5 || ($majorVersion == 5 && $minorVersion < 2)) {
+if($majorVersion < 5 || ($majorVersion == 5 && $minorVersion < 3)) {
 	header("HTTP/1.1 500 Server Error");
 	echo str_replace('$PHPVersion', phpversion(), file_get_contents("sapphire/dev/install/php5-required.html"));
 	die();
 }
 
-include('sapphire/dev/install/install.php5');
\ No newline at end of file
+include('sapphire/dev/install/install.php5');
diff --git a/dev/install/install.php5 b/dev/install/install.php5
index 45c95f2d3..6a35136c0 100644
--- a/dev/install/install.php5
+++ b/dev/install/install.php5
@@ -4,7 +4,7 @@
  ************************************************************************************
  **                                                                                **
  **  If you can read this text in your browser then you don't have PHP installed.  **
- **  Please install PHP 5.2 or higher, preferably PHP 5.3.                         **
+ **  Please install PHP 5.3 or higher.                                             **
  **                                                                                **
  ************************************************************************************
  ************************************************************************************/
diff --git a/dev/install/php5-required.html b/dev/install/php5-required.html
index fe072ffbc..6a7a2f132 100644
--- a/dev/install/php5-required.html
+++ b/dev/install/php5-required.html
@@ -11,7 +11,6 @@
 			<div id="Container">
 				<div id="Header">
 					<h1>SilverStripe CMS Installation</h1>
-
 				</div>
 				
 				<div id="Navigation">&nbsp;</div>
@@ -20,10 +19,10 @@
 				<div id="Layout">
 					<div class="typography">
 						<h1>PHP 5 required</h1>
-						<h2>To run SilverStripe, please install PHP 5.2 or greater.</h2>
+						<h2>To run SilverStripe, please install PHP 5.3 or greater.</h2>
 		
 						<p>We have detected that you are running PHP version <b>$PHPVersion</b>.  In order to run SilverStripe, 
-						you must have PHP version 5.2 or greater, and for best results we recommend PHP 5.3 or greater.</p>
+						you must have PHP version 5.3 or greater.</p>
 
 						<p>If you are running on a shared host, you may need to ask your hosting provider how to do this.</p>
 					</div>
@@ -37,4 +36,4 @@
 			</div>
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/main.php b/main.php
index 651e8416a..2e43b0a12 100644
--- a/main.php
+++ b/main.php
@@ -1,9 +1,10 @@
 <?php
+
 /************************************************************************************
  ************************************************************************************
  **                                                                                **
  **  If you can read this text in your browser then you don't have PHP installed.  **
- **  Please install PHP 5.0 or higher, preferably PHP 5.2 or 5.3.                  **
+ **  Please install PHP 5.3 or higher.                                             **
  **                                                                                **
  ************************************************************************************
  ************************************************************************************/
@@ -12,8 +13,10 @@
  * @package sapphire
  * @subpackage core
  */
+$majorVersion = strtok(phpversion(),'.');
+$minorVersion = strtok('.');
 
-if(version_compare(phpversion(), 5, '<')) {
+if($majorVersion < 5 || ($majorVersion == 5 && $minorVersion < 3)) {
 	header("HTTP/1.1 500 Server Error");
 	echo str_replace('$PHPVersion', phpversion(), file_get_contents("dev/install/php5-required.html"));
 	die();