Index: trunk/kernel/include/adodb/adodb.inc.php
===================================================================
diff -u -N -r4880 -r6093
--- trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 4880)
+++ trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 6093)
@@ -35,19 +35,28 @@
 	  
  */
  
+	if (!function_exists('adodb_safeDefine')) {
+		function adodb_safeDefine($const_name, $value)
+		{
+			if (!defined($const_name)) {
+				define($const_name, $value);
+			}
+		}
+	}
+	
  if (!defined('_ADODB_LAYER')) {
  	define('_ADODB_LAYER',1);
 	
 	//==============================================================================================	
 	// CONSTANT DEFINITIONS
 	//==============================================================================================	
 
-	define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>');
+	adodb_safeDefine('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>');
 	
-	define('ADODB_FETCH_DEFAULT',0);
-	define('ADODB_FETCH_NUM',1);
-	define('ADODB_FETCH_ASSOC',2);
-	define('ADODB_FETCH_BOTH',3);
+	adodb_safeDefine('ADODB_FETCH_DEFAULT',0);
+	adodb_safeDefine('ADODB_FETCH_NUM',1);
+	adodb_safeDefine('ADODB_FETCH_ASSOC',2);
+	adodb_safeDefine('ADODB_FETCH_BOTH',3);
 	
 	/*
 	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
@@ -60,7 +69,7 @@
 	if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 	
 	// allow [ ] @ ` and . in table names
-	define('ADODB_TABLE_REGEX','([]0-9a-z_\`\.\@\[-]*)');
+	adodb_safeDefine('ADODB_TABLE_REGEX','([]0-9a-z_\`\.\@\[-]*)');
 	
 	
 	if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
@@ -90,6 +99,7 @@
 	// GLOBAL SETUP
 	//==============================================================================================	
 	
+	if (!defined('ADODB_PHPVER')) {
 	if (strnatcmp(PHP_VERSION,'4.3.0')>=0) {
 		define('ADODB_PHPVER',0x4300);
 	} else if (strnatcmp(PHP_VERSION,'4.2.0')>=0) {
@@ -98,6 +108,7 @@
 		define('ADODB_PHPVER',0x4050);
 	} else {
 		define('ADODB_PHPVER',0x4000);
+		}
 	}
 	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
 	//if (extension_loaded('dbx')) define('ADODB_DBX',1);