Multi database setup

1 files changed, 3 insertions, 7 deletions

diff --git a/system/database/DB.php b/system/database/DB.php
index e9434231c..0d81e40d3 100755
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -92,16 +92,12 @@ function &DB($params = '', $active_record_override = NULL)
 		if (isset($dsn['query']))
 		{
 			parse_str($dsn['query'], $extra);
+
 			foreach ($extra as $key => $val)
 			{
-				// booleans please
-				if (strtoupper($val) === 'TRUE')
-				{
-					$val = TRUE;
-				}
-				elseif (strtoupper($val) === 'FALSE')
+				if (is_string($val) && in_array(strtoupper($val), array('TRUE', 'FALSE', 'NULL')))
 				{
-					$val = FALSE;
+					$val = var_export($val);
 				}
 
 				$params[$key] = $val;