From 8c55bf0fe6030eb41b2be408df1cf226cb184933 Mon Sep 17 00:00:00 2001 From: leesbian Date: Tue, 15 May 2012 15:53:07 +0100 Subject: [PATCH] reverted changes for PHP 5.3 garbage collector --- api.php | 6 +----- cron.php | 4 ---- get.php | 8 +------- index.php | 9 ++------- install.php | 6 +----- 5 files changed, 5 insertions(+), 28 deletions(-) mode change 100755 => 100644 api.php mode change 100755 => 100644 cron.php mode change 100755 => 100644 get.php mode change 100755 => 100644 index.php mode change 100755 => 100644 install.php diff --git a/api.php b/api.php old mode 100755 new mode 100644 index 5c007f20f..6430d5cce --- a/api.php +++ b/api.php @@ -23,10 +23,6 @@ * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -if (version_compare(phpversion(), '5.3.0', '>=') === true) -{ - gc_enable(); -} if (version_compare(phpversion(), '5.2.0', '<')) { echo 'It looks like you have an invalid PHP version. Magento supports PHP 5.2.0 or newer'; @@ -89,4 +85,4 @@ echo $e->getMessage(); exit; } -} \ No newline at end of file +} diff --git a/cron.php b/cron.php old mode 100755 new mode 100644 index ab2a4c388..d555fca11 --- a/cron.php +++ b/cron.php @@ -23,10 +23,6 @@ * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -if (version_compare(phpversion(), '5.3.0', '>=') === true) -{ - gc_enable(); -} require 'app/Mage.php'; diff --git a/get.php b/get.php old mode 100755 new mode 100644 index 64eab72c3..a7fe80201 --- a/get.php +++ b/get.php @@ -24,13 +24,7 @@ * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -if (version_compare(phpversion(), '5.3.0', '>=') === true) -{ - gc_enable(); -} - -if (version_compare(phpversion(), '5.2.0', '<') === true) -{ +if (version_compare(phpversion(), '5.2.0', '<')===true) { echo '

Whoops, it looks like you have an invalid PHP version.' diff --git a/index.php b/index.php old mode 100755 new mode 100644 index 520e506fa..99181c05b --- a/index.php +++ b/index.php @@ -23,13 +23,8 @@ * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -if (version_compare(phpversion(), '5.3.0', '>=') === true) -{ - gc_enable(); -} -if (version_compare(phpversion(), '5.2.0', '<') === true) -{ +if (version_compare(phpversion(), '5.2.0', '<')===true) { echo '

@@ -89,4 +84,4 @@ /* Run store or run website */ $mageRunType = isset($_SERVER['MAGE_RUN_TYPE']) ? $_SERVER['MAGE_RUN_TYPE'] : 'store'; -Mage::run($mageRunCode, $mageRunType); \ No newline at end of file +Mage::run($mageRunCode, $mageRunType); diff --git a/install.php b/install.php old mode 100755 new mode 100644 index 03be3effe..a96fa2c02 --- a/install.php +++ b/install.php @@ -117,10 +117,6 @@ * --encryption_key // optional, will be automatically generated and displayed on success, if not specified * */ -if (version_compare(phpversion(), '5.3.0', '>=') === true) -{ - gc_enable(); -} if (version_compare(phpversion(), '5.2.0', '<')===true) { die('ERROR: Whoops, it looks like you have an invalid PHP version. Magento supports PHP 5.2.0 or newer.'); @@ -156,4 +152,4 @@ } } } -exit(1); // don't delete this as this should notify about failed installation \ No newline at end of file +exit(1); // don't delete this as this should notify about failed installation