summaryrefslogtreecommitdiffstats
path: root/user_guide
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 /user_guide
parentba323006173997b4a1ff5da87e2adb03f4d5de80 (diff)
parenteaa5541deb9409d936f77d24d696cf977ef505df (diff)
Fixed conflict with changelog.
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/changelog.html1
1 files changed, 1 insertions, 0 deletions
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>