summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/database/DB_active_rec.php2
-rw-r--r--user_guide/changelog.html6
2 files changed, 6 insertions, 2 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index e8cefa2db..b8dce6df5 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1374,7 +1374,7 @@ class CI_DB_active_record extends CI_DB_driver {
$this->limit($limit);
}
- if (count($this->ar_where) == 0 && count($this->ar_like) == 0)
+ if (count($this->ar_where) == 0 && count($this->ar_wherein) == 0 && count($this->ar_like))
{
if ($this->db_debug)
{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 7aea9a6c9..a0c0fd06b 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -70,7 +70,11 @@ SVN Revision: </p>
<li>Added more accurate error reporting for the Email library when using sendmail.</li>
</ul>
</li>
- <li>Helpers
+ <li>Database
+ <ul>
+ <li>Added where_in to the list of expected arguments received by <kbd>delete()</kbd>.</li>
+ </ul>
+ </li> <li>Helpers
<ul>
<li>Added a doctype() function to the <a href="helpers/html_helper.html">HTML helper</a>.</li>
</ul>