diff options
| author | purandi <free6300@gmail.com> | 2011-08-26 13:55:14 +0200 |
|---|---|---|
| committer | purandi <free6300@gmail.com> | 2011-08-26 13:55:14 +0200 |
| commit | dcf3d1bf17e1354ff0a644f390ed590f2e65298b (patch) | |
| tree | 82a9351d34e27d5299aee0ac62f6aa5e03140112 | |
| parent | 107615a7271c84bd990cb8ea8fa776faaaf9c16e (diff) | |
| parent | b4009e2fc52c3f1c9f58a9461a7c6cbb0a934898 (diff) | |
Merge branch 'develop', remote-tracking branch 'origin/develop' into develop
| -rw-r--r-- | system/database/drivers/oci8/oci8_driver.php | 1 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 | ||||
| -rw-r--r-- | user_guide/helpers/url_helper.html | 2 |
3 files changed, 3 insertions, 1 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) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c030ce77c..33e0a62c1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -116,6 +116,7 @@ Change Log <li>Fixed a bug (#150) - <samp>field_data()</samp> now correctly returns column length.</li> <li>Fixed a bug (#8) - <samp>load_class()</samp> now looks for core classes in <samp>APPPATH</samp> first, allowing them to be replaced.</li> <li>Fixed a bug (#24) - ODBC database driver called incorrect parent in __construct().</li> + <li>Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did not escape correct.</li> </ul> <h2>Version 2.0.3</h2> diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index ac9d0a68e..e60e96bf0 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -27,7 +27,7 @@ <div id="masthead"> <table cellpadding="0" cellspacing="0" border="0" style="width:100%"> <tr> -<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td> +<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td> <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td> </tr> </table> |