cvs: pear /Log/Log sql.php
| From: | Jon Parise | Date: | Tue, 03 Jan 2006 04:12:46 +0000 |
| Subject: | cvs: pear /Log/Log sql.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-37273@lists.php.net to get a copy of this message | ||
jon Tue Jan 3 04:12:46 2006 UTC
Modified files:
/pear/Log/Log sql.php
Log:
We require the PEAR DB class. This is generally defined in the DB.php
file, but it's possible that the caller may have provided the DB class, or
a compatible wrapper (such as the one shipped with MDB2), so we first
check for an existing 'DB' class before including 'DB.php'.
Bug: 6214
http://cvs.php.net/viewcvs.cgi/pear/Log/Log/sql.php?r1=1.39&r2=1.40&diff_format=u
Index: pear/Log/Log/sql.php
diff -u pear/Log/Log/sql.php:1.39 pear/Log/Log/sql.php:1.40
--- pear/Log/Log/sql.php:1.39 Tue Oct 25 16:42:53 2005
+++ pear/Log/Log/sql.php Tue Jan 3 04:12:45 2006
@@ -1,14 +1,21 @@
<?php
/**
- * $Header: /repository/pear/Log/Log/sql.php,v 1.39 2005/10/25 16:42:53 jon Exp $
+ * $Header: /repository/pear/Log/Log/sql.php,v 1.40 2006/01/03 04:12:45 jon Exp $
* $Horde: horde/lib/Log/sql.php,v 1.12 2000/08/16 20:27:34 chuck Exp $
*
- * @version $Revision: 1.39 $
+ * @version $Revision: 1.40 $
* @package Log
*/
-/** PEAR's DB package */
-require_once 'DB.php';
+/*
+ * We require the PEAR DB class. This is generally defined in the DB.php file,
+ * but it's possible that the caller may have provided the DB class, or a
+ * compatible wrapper (such as the one shipped with MDB2), so we first check
+ * for an existing 'DB' class before including 'DB.php'.
+ */
+if (!class_exists('DB')) {
+ require_once 'DB.php';
+}
/**
* The Log_sql class is a concrete implementation of the Log::