svn: /pear/pearweb/trunk/public_html/ go-pear

dufuz                                    Thu, 10 Mar 2011 18:36:20 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=309077

Log:
Only bail out on people if they are running PHP 5.1.6 and are on the CLI oppose to in web installer mode.

Changed paths:
    U   pear/pearweb/trunk/public_html/go-pear

Modified: pear/pearweb/trunk/public_html/go-pear
===================================================================
--- pear/pearweb/trunk/public_html/go-pear	2011-03-10 18:09:45 UTC (rev 309076)
+++ pear/pearweb/trunk/public_html/go-pear	2011-03-10 18:36:20 UTC (rev 309077)
@@ -53,7 +53,7 @@
 error_reporting( E_ALL & ~E_NOTICE);

 define('WINDOWS', (substr(PHP_OS, 0, 3) == 'WIN'));
-define('GO_PEAR_VER', '1.1.5');
+define('GO_PEAR_VER', '1.1.6');

 define('WIN32GUI', !WEBINSTALLER && WINDOWS && $sapi_name=='cli' && which('cscript'));

@@ -101,7 +101,7 @@
 Please upgrade PHP to a newer version, and try again.  See you then.

 ");
-} elseif (function_exists("version_compare") && version_compare($phpVersion, "5.1.6",'>=')) {
+} elseif (!WEBINSTALLER && function_exists("version_compare") && version_compare($phpVersion, "5.1.6",'>=')) {
     die("Sorry!  Your PHP version is too new ($phpVersion) for this go-pear.
 Instead use http://pear.php.net/go-pear.phar for a more stable and current
 version of go-pear, more suited to your PHP version.