Browse files

Fixed conflict in changelog.

  • Loading branch information...
1 parent 090eb60 commit 76e621786007907192c3e84cbde3e1a12dbf83fb @philsturgeon philsturgeon committed Aug 9, 2011
Showing with 3 additions and 1 deletion.
  1. +2 −1 system/database/DB_active_rec.php
  2. +1 −0 user_guide/changelog.html
3 system/database/DB_active_rec.php
@@ -1694,7 +1694,8 @@ protected function _compile_select($select_override = FALSE)
// is because until the user calls the from() function we don't know if there are aliases
foreach ($this->ar_select as $key => $val)
- $this->ar_select[$key] = $this->_protect_identifiers($val, FALSE, $this->ar_no_escape[$key]);
+ $no_escape = isset($this->ar_no_escape[$key]) ? $this->ar_no_escape[$key] : NULL;
+ $this->ar_select[$key] = $this->_protect_identifiers($val, FALSE, $no_escape);
$sql .= implode(', ', $this->ar_select);
1 user_guide/changelog.html
@@ -104,6 +104,7 @@
<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>
<h2>Version 2.0.2</h2>

0 comments on commit 76e6217

Please sign in to comment.