summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-10 00:03:49 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-13 19:25:35 +0200
commit76e621786007907192c3e84cbde3e1a12dbf83fb (patch)
treef9daf41bc9b18db994e13299da1938b73896983b /user_guide
parent090eb6075eac3a16974f6baed236875ee1dc8a90 (diff)
Fixed conflict in 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 f5eb53aa3..e6c1425af 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -104,6 +104,7 @@ Change Log
<li class="reactor">Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.</li>
<li class="reactor">Fixed a bug where the method <kbd>$this->cart->total_items()</kbd> from <a href="libraries/cart.html">Cart Library</a> now returns the sum of the quantity of all items in the cart instead of your total count.</li>
<li class="reactor">Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.</li>
+ <li class="reactor">Fixed a bug where using <kbd>$this->db->select_max()</kdb>, <kbd>$this->db->select_min()</kdb>, etc could throw notices. Thanks to w43l for the patch.</li>
</ul>
<h2>Version 2.0.2</h2>