summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysql/mysql_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-06 19:16:42 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-06 19:16:42 +0100
commit043f2602c7dc0a0eae62f745a7362160dc8ccec5 (patch)
tree35b3298825f1143b4f663933a214623314f254dd /system/database/drivers/mysql/mysql_driver.php
parent4c598360d646f734d254d45b397bc26984999f0a (diff)
parent032e7ea646b953a8f4d28327d7f487de2ffa7288 (diff)
Merge upstream branch
Diffstat (limited to 'system/database/drivers/mysql/mysql_driver.php')
-rw-r--r--system/database/drivers/mysql/mysql_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 7fd08a6ed..cd1763751 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -416,7 +416,7 @@ class CI_DB_mysql_driver extends CI_DB {
return ($this->db_debug) ? $this->display_error('db_field_param_missing') : FALSE;
}
- $query = $this->query('DESCRIBE '.$this->_protect_identifiers($table, TRUE, NULL, FALSE));
+ $query = $this->query('DESCRIBE '.$this->protect_identifiers($table, TRUE, NULL, FALSE));
$query = $query->result_object();
$retval = array();