summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-07-17 18:59:20 +0200
committerAndrey Andreev <narf@devilix.net>2013-07-17 18:59:20 +0200
commite18de50dc1a4369aef18df9b368f8bfb0f9177d9 (patch)
tree07708fb20dbe57adc99f4d71683b8b22673a2d28 /system/database
parent2ecc06ce74e089f6d57ed396f006b749e7741999 (diff)
Cherry-picking some changes from PR #2425:
- Session events logging (debug) - Bug fix for OCI8 method stored_procedure()
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php1
-rw-r--r--system/database/drivers/oci8/oci8_driver.php8
2 files changed, 2 insertions, 7 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 593d78ba4..425657e17 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -561,7 +561,6 @@ abstract class CI_DB_driver {
if ($sql === '')
{
log_message('error', 'Invalid query: '.$sql);
-
return ($this->db_debug) ? $this->display_error('db_invalid_query') : FALSE;
}
elseif ( ! is_bool($return_object))
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 0ec8b53b8..93e62b4dd 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -327,12 +327,8 @@ class CI_DB_oci8_driver extends CI_DB {
{
if ($package === '' OR $procedure === '' OR ! is_array($params))
{
- if ($this->db_debug)
- {
- log_message('error', 'Invalid query: '.$package.'.'.$procedure);
- return $this->display_error('db_invalid_query');
- }
- return FALSE;
+ log_message('error', 'Invalid query: '.$package.'.'.$procedure);
+ return ($this->db_debug) ? $this->display_error('db_invalid_query') : FALSE;
}
// build the query string