summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-26 13:46:14 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-26 13:46:14 +0200
commitb4009e2fc52c3f1c9f58a9461a7c6cbb0a934898 (patch)
tree82a9351d34e27d5299aee0ac62f6aa5e03140112 /system/database
parentba323006173997b4a1ff5da87e2adb03f4d5de80 (diff)
parenteaa5541deb9409d936f77d24d696cf977ef505df (diff)
Fixed conflict with changelog.
Diffstat (limited to 'system/database')
-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)