cvs: php4(PHP_4_0_7) /pear PEAR.php /pear/DB odbc.php /pear/XML Parser.php /pear/tests pear_versioncmp.phpt
| From: | Stig Bakken | Date: | Thu, 11 Oct 2001 22:28:26 +0000 |
| Subject: | cvs: php4(PHP_4_0_7) /pear PEAR.php /pear/DB odbc.php /pear/XML Parser.php /pear/tests pear_versioncmp.phpt | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-981@lists.php.net to get a copy of this message | ||
ssb Thu Oct 11 18:28:26 2001 EDT
Removed files: (Branch: PHP_4_0_7)
/php4/pear/tests pear_versioncmp.phpt
Modified files:
/php4/pear PEAR.php
/php4/pear/DB odbc.php
/php4/pear/XML Parser.php
Log:
MFH: phpVersionIs -> version_compare
Index: php4/pear/PEAR.php
diff -u php4/pear/PEAR.php:1.13.2.2 php4/pear/PEAR.php:1.13.2.3
--- php4/pear/PEAR.php:1.13.2.2 Tue Oct 9 18:53:58 2001
+++ php4/pear/PEAR.php Thu Oct 11 18:28:25 2001
@@ -19,7 +19,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: PEAR.php,v 1.13.2.2 2001/10/09 22:53:58 ssb Exp $
+// $Id: PEAR.php,v 1.13.2.3 2001/10/11 22:28:25 ssb Exp $
//
define('PEAR_ERROR_RETURN', 1);
Index: php4/pear/DB/odbc.php
diff -u php4/pear/DB/odbc.php:1.36.2.2 php4/pear/DB/odbc.php:1.36.2.3
--- php4/pear/DB/odbc.php:1.36.2.2 Tue Oct 9 18:54:00 2001
+++ php4/pear/DB/odbc.php Thu Oct 11 18:28:26 2001
@@ -17,7 +17,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: odbc.php,v 1.36.2.2 2001/10/09 22:54:00 ssb Exp $
+// $Id: odbc.php,v 1.36.2.3 2001/10/11 22:28:26 ssb Exp $
//
// Database independent query interface definition for PHP's ODBC
// extension.
@@ -191,13 +191,13 @@
function fetchInto($result, &$row, $fetchmode, $rownum=null)
{
if ($rownum !== null) {
- if (PEAR::phpVersionIs('4.0.5')) {
+ if (version_compare(phpversion(), "4.0.5", "lt")) {
$cols = odbc_fetch_into($result, $rownum, &$row);
} else {
$cols = odbc_fetch_into($result, $rownum, $row);
}
} else {
- if (PEAR::phpVersionIs('4.0.5')) {
+ if (version_compare(phpversion(), "4.0.5", "lt")) {
$cols = odbc_fetch_into($result, &$row);
} else {
$cols = odbc_fetch_into($result, $row);
Index: php4/pear/XML/Parser.php
diff -u php4/pear/XML/Parser.php:1.16.2.1 php4/pear/XML/Parser.php:1.16.2.2
--- php4/pear/XML/Parser.php:1.16.2.1 Tue Oct 9 18:54:10 2001
+++ php4/pear/XML/Parser.php Thu Oct 11 18:28:26 2001
@@ -17,7 +17,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: Parser.php,v 1.16.2.1 2001/10/09 22:54:10 ssb Exp $
+// $Id: Parser.php,v 1.16.2.2 2001/10/11 22:28:26 ssb Exp $
require_once "PEAR.php";
@@ -145,7 +145,7 @@
case "func":
// use call_user_func() when php >= 4.0.7
// or call_user_method() if not
- if (PEAR::phpVersionIs('4.0.7')) {
+ if (version_compare(phpversion(), '4.0.7', 'lt')) {
$this->use_call_user_func = false;
} else {
$this->use_call_user_func = true;