!!! Cleanup #9678: Make TYPO3 require PHP 5.2
authorIngo Renner <ingo.renner@typo3.org>
Wed, 29 Oct 2008 21:14:11 +0000 (21:14 +0000)
committerIngo Renner <ingo.renner@typo3.org>
Wed, 29 Oct 2008 21:14:11 +0000 (21:14 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4385 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_div.php
typo3/init.php
typo3/sysext/cms/tslib/index_ts.php

index 764875a..6799543 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-10-29  Ingo Renner  <ingo@typo3.org>
 
        * Added feature #9591: Integrate sys_actions into toolbar
+       * !!! Cleanup #9678: Make TYPO3 require PHP 5.2
 
 2008-10-28  Ingo Renner  <ingo@typo3.org>
 
index 888a74a..06feb22 100755 (executable)
@@ -2662,16 +2662,10 @@ final class t3lib_div {
                                        )
                                );
                        $content = @file_get_contents($url, false, $ctx);
-                       if ($content === false && isset($report))       {
-                                       // TODO: Remove this once PHP 5.1 support is dropped completely
-                               if (function_exists('error_get_last')) {
-                                       $phpError = error_get_last();
-                                       $report['error'] = $phpError['type'];
-                                       $report['message'] = $phpError['message'];
-                               } else {
-                                       $report['error'] = -1;
-                                       $report['message'] = 'Couldn\'t get URL.';
-                               }
+                       if ($content === false && isset($report)) {
+                               $phpError = error_get_last();
+                               $report['error'] = $phpError['type'];
+                               $report['message'] = $phpError['message'];
                        }
                } else  {
                        if (isset($report))     {
index eeb81be..90b65a8 100755 (executable)
@@ -60,7 +60,7 @@
 // *******************************
 // Checking PHP version
 // *******************************
-if (version_compare(phpversion(), '5.1', '<')) die ('TYPO3 requires PHP 5.1.0 or higher.');
+if (version_compare(phpversion(), '5.2', '<')) die ('TYPO3 requires PHP 5.2.0 or higher.');
 
 
 // *******************************
index 649083b..892747b 100755 (executable)
@@ -41,7 +41,7 @@
 // *******************************
 // Checking PHP version
 // *******************************
-if (version_compare(phpversion(), '5.1', '<')) die ('TYPO3 requires PHP 5.1.0 or higher.');
+if (version_compare(phpversion(), '5.2', '<')) die ('TYPO3 requires PHP 5.2.0 or higher.');
 
 // *******************************
 // Set error reporting