cvs: /php4/pear DB.php HTTP.php /php4/pear/DB common.php mysql.php odbc.php pgsql.php storage.php
| From: | Stig Bakken | Date: | Sun, 27 Feb 2000 14:46:27 +0000 |
| Subject: | cvs: /php4/pear DB.php HTTP.php /php4/pear/DB common.php mysql.php odbc.php pgsql.php storage.php | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-11074@lists.php.net to get a copy of this message | ||
ssb Sun Feb 27 06:46:27 2000 EDT
Modified files:
/php4/pear DB.php HTTP.php
/php4/pear/DB common.php mysql.php odbc.php pgsql.php storage.php
Log:
Avoid E_NOTICE errors in PEAR code.
Index: php4/pear/DB.php
diff -u php4/pear/DB.php:1.16 php4/pear/DB.php:1.17
--- php4/pear/DB.php:1.16 Fri Feb 25 13:18:01 2000
+++ php4/pear/DB.php Sun Feb 27 06:46:27 2000
@@ -17,12 +17,12 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: DB.php,v 1.16 2000/02/25 21:18:01 ssb Exp $
+// $Id: DB.php,v 1.17 2000/02/27 14:46:27 ssb Exp $
//
// Database independent query interface.
//
-if ($GLOBALS['USED_PACKAGES']['DB']) return;
+if (!empty($GLOBALS['USED_PACKAGES']['DB'])) return;
$GLOBALS['USED_PACKAGES']['DB'] = true;
// {{{ Database independent error codes.
Index: php4/pear/HTTP.php
diff -u php4/pear/HTTP.php:1.2 php4/pear/HTTP.php:1.3
--- php4/pear/HTTP.php:1.2 Sat Feb 26 08:03:50 2000
+++ php4/pear/HTTP.php Sun Feb 27 06:46:27 2000
@@ -17,12 +17,12 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: HTTP.php,v 1.2 2000/02/26 16:03:50 ssb Exp $
+// $Id: HTTP.php,v 1.3 2000/02/27 14:46:27 ssb Exp $
//
// HTTP utility functions.
//
-if ($GLOBALS['USED_PACKAGES']['HTTP']) return;
+if (!empty($GLOBALS['USED_PACKAGES']['HTTP'])) return;
$GLOBALS['USED_PACKAGES']['HTTP'] = true;
class HTTP {
Index: php4/pear/DB/common.php
diff -u php4/pear/DB/common.php:1.9 php4/pear/DB/common.php:1.10
--- php4/pear/DB/common.php:1.9 Thu Feb 17 12:21:02 2000
+++ php4/pear/DB/common.php Sun Feb 27 06:46:27 2000
@@ -29,7 +29,7 @@
// a reference.
//
-if ($GLOBALS['USED_PACKAGES']['DB/common']) return;
+if (!empty($GLOBALS['USED_PACKAGES']['DB/common'])) return;
$GLOBALS['USED_PACKAGES']['DB/common'] = true;
/**
Index: php4/pear/DB/mysql.php
diff -u php4/pear/DB/mysql.php:1.12 php4/pear/DB/mysql.php:1.13
--- php4/pear/DB/mysql.php:1.12 Thu Feb 17 12:21:02 2000
+++ php4/pear/DB/mysql.php Sun Feb 27 06:46:27 2000
@@ -28,9 +28,9 @@
// be registered here.
//
-if ($GLOBALS['USED_PACKAGES']['DB/mysql']) return;
+if (!empty($GLOBALS['USED_PACKAGES']['DB/mysql'])) return;
$GLOBALS['USED_PACKAGES']['DB/mysql'] = true;
-if (!$GLOBALS['USED_PACKAGES']['DB/common']) {
+if (empty($GLOBALS['USED_PACKAGES']['DB/common'])) {
include("DB/common.php");
}
Index: php4/pear/DB/odbc.php
diff -u php4/pear/DB/odbc.php:1.4 php4/pear/DB/odbc.php:1.5
--- php4/pear/DB/odbc.php:1.4 Thu Feb 3 02:49:04 2000
+++ php4/pear/DB/odbc.php Sun Feb 27 06:46:27 2000
@@ -31,9 +31,9 @@
// a reference.
//
-if ($GLOBALS['USED_PACKAGES']['DB/odbc']) return;
+if (!empty($GLOBALS['USED_PACKAGES']['DB/odbc'])) return;
$GLOBALS['USED_PACKAGES']['DB/odbc'] = true;
-if (!$GLOBALS['USED_PACKAGES']['DB/common']) {
+if (empty($GLOBALS['USED_PACKAGES']['DB/common'])) {
include("DB/common.php");
}
Index: php4/pear/DB/pgsql.php
diff -u php4/pear/DB/pgsql.php:1.3 php4/pear/DB/pgsql.php:1.4
--- php4/pear/DB/pgsql.php:1.3 Sun Feb 20 00:40:06 2000
+++ php4/pear/DB/pgsql.php Sun Feb 27 06:46:27 2000
@@ -46,9 +46,9 @@
// be registered here.
//
-if ($GLOBALS['USED_PACKAGES']['DB/pgsql']) return;
+if (!empty($GLOBALS['USED_PACKAGES']['DB/pgsql'])) return;
$GLOBALS['USED_PACKAGES']['DB/pgsql'] = true;
-if (!$GLOBALS['USED_PACKAGES']['DB/common']) {
+if (empty($GLOBALS['USED_PACKAGES']['DB/common'])) {
include("DB/common.php");
}
Index: php4/pear/DB/storage.php
diff -u php4/pear/DB/storage.php:1.2 php4/pear/DB/storage.php:1.3
--- php4/pear/DB/storage.php:1.2 Thu Feb 17 12:21:02 2000
+++ php4/pear/DB/storage.php Sun Feb 27 06:46:27 2000
@@ -21,9 +21,9 @@
// can be manipulated and that updates the database accordingly.
//
-if ($GLOBALS['USED_PACKAGES']['DB/storage']) return;
+if (!empty($GLOBALS['USED_PACKAGES']['DB/storage'])) return;
$GLOBALS['USED_PACKAGES']['DB/storage'] = true;
-if (!$GLOBALS['USED_PACKAGES']['DB']) {
+if (empty($GLOBALS['USED_PACKAGES']['DB'])) {
include('DB.php');
}