diff options
| author | Rick Ellis <rick.ellis@ellislab.com> | 2008-10-26 23:46:55 +0100 |
|---|---|---|
| committer | Rick Ellis <rick.ellis@ellislab.com> | 2008-10-26 23:46:55 +0100 |
| commit | a0e86293949ff7761cca573853e54146d76f9ba7 (patch) | |
| tree | 052316b67913584a8e2697c7977eccb3e5dde416 /system/database/drivers/mysqli/mysqli_driver.php | |
| parent | 1358485a01d9d0137b59dc2edc6249c42025e26b (diff) | |
Fixed a bug in which identifers were not being escaped properly when reserved characters were used
Diffstat (limited to 'system/database/drivers/mysqli/mysqli_driver.php')
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_driver.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index f72db64b6..1b3da7a6b 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -425,7 +425,18 @@ class CI_DB_mysqli_driver extends CI_DB { {
return $item;
}
-
+
+ foreach ($this->_reserved_identifiers as $id)
+ {
+ if (strpos($item, '.'.$id) !== FALSE)
+ {
+ $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item);
+
+ // remove duplicates if the user already included the escape
+ return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str);
+ }
+ }
+
if (strpos($item, '.') !== FALSE)
{
$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char;
|