From 452fdf99810fae93d3e8735cc9be5e9cbd4b0622 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 1 Sep 2006 01:58:35 +0000
Subject: resolve adodb defined clashes, add TCallbackClientScript::fireEvent()

---
 framework/3rdParty/adodb/adodb-time.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'framework/3rdParty/adodb')

diff --git a/framework/3rdParty/adodb/adodb-time.inc.php b/framework/3rdParty/adodb/adodb-time.inc.php
index 51f69f76..195998c2 100644
--- a/framework/3rdParty/adodb/adodb-time.inc.php
+++ b/framework/3rdParty/adodb/adodb-time.inc.php
@@ -383,7 +383,8 @@ define('ADODB_DATE_VERSION',0.24);
 	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
 */
 
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+if (!defined('ADODB_ALLOW_NEGATIVE_TS') 
+	&& !defined('ADODB_NO_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
 
 function adodb_date_test_date($y1,$m,$d=13)
 {
-- 
cgit v1.2.3