summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-10-28 20:50:23 +0200
committeradmin <devnull@localhost>2006-10-28 20:50:23 +0200
commit59612e91b178e729ffd63cbabb0446fd51038e50 (patch)
tree873b6efb64c222004df406e90091d1b210a7aa82 /system
parent985a63828098c239d43fa512a6034d524ccd2e9d (diff)
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_driver.php17
1 files changed, 10 insertions, 7 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index d08e47f26..49ac8ab24 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -154,16 +154,19 @@ class CI_DB_driver {
}
// Select the database
- if ( ! $this->db_select())
+ if ($this->database != '')
{
- log_message('error', 'Unable to select database: '.$this->database);
-
- if ($this->db_debug)
+ if ( ! $this->db_select())
{
- $this->display_error('db_unable_to_select', $this->database);
+ log_message('error', 'Unable to select database: '.$this->database);
+
+ if ($this->db_debug)
+ {
+ $this->display_error('db_unable_to_select', $this->database);
+ }
+ return FALSE;
}
- return FALSE;
- }
+ }
return TRUE;
}