summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorpurandi <free6300@gmail.com>2011-08-26 13:55:14 +0200
committerpurandi <free6300@gmail.com>2011-08-26 13:55:14 +0200
commitdcf3d1bf17e1354ff0a644f390ed590f2e65298b (patch)
tree82a9351d34e27d5299aee0ac62f6aa5e03140112 /system
parent107615a7271c84bd990cb8ea8fa776faaaf9c16e (diff)
parentb4009e2fc52c3f1c9f58a9461a7c6cbb0a934898 (diff)
Merge branch 'develop', remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'system')
-rw-r--r--system/database/drivers/oci8/oci8_driver.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 42cfaaefb..d4adfd528 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -404,6 +404,7 @@ class CI_DB_oci8_driver extends CI_DB {
}
$str = remove_invisible_characters($str);
+ $str = str_replace("'", "''", $str);
// escape LIKE condition wildcards
if ($like === TRUE)