summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-05-08 00:06:51 +0200
committerDerek Jones <derek.jones@ellislab.com>2008-05-08 00:06:51 +0200
commitd007243f15002bac68291fc7e8acbe6303f81a78 (patch)
tree9c7431cb835100d57af39f6c807659d5c58a32c2
parentb514b029391c9559b567d2e2d5dd97f0e7de0be1 (diff)
flipped the $not flag for or_where_not_in()
http://codeigniter.com/bug_tracker/bug/4171/
-rw-r--r--system/database/DB_active_rec.php6
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 5 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 1820bd202..49d438727 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -483,7 +483,6 @@ class CI_DB_active_record extends CI_DB_driver {
* @access public
* @param string The field to search
* @param array The values searched on
-
* @return object
*/
function where_in($key = NULL, $values = NULL)
@@ -502,7 +501,6 @@ class CI_DB_active_record extends CI_DB_driver {
* @access public
* @param string The field to search
* @param array The values searched on
-
* @return object
*/
function or_where_in($key = NULL, $values = NULL)
@@ -521,7 +519,6 @@ class CI_DB_active_record extends CI_DB_driver {
* @access public
* @param string The field to search
* @param array The values searched on
-
* @return object
*/
function where_not_in($key = NULL, $values = NULL)
@@ -540,12 +537,11 @@ class CI_DB_active_record extends CI_DB_driver {
* @access public
* @param string The field to search
* @param array The values searched on
-
* @return object
*/
function or_where_not_in($key = NULL, $values = NULL)
{
- return $this->_where_in($key, $values, FALSE, 'OR ');
+ return $this->_where_in($key, $values, TRUE, 'OR ');
}
// --------------------------------------------------------------------
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 851ec7a92..351e1e85e 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -114,6 +114,7 @@ SVN Commit: not currently released</p>
<li>Fixed DB Driver and MySQLi result driver checking for resources instead of objects (#3461).</li>
<li>Fixed an incorrect documentation of $this-&gt;load-&gt;language (#3520).</li>
<li>Fixed an AR_caching error where it wasn't tracking table aliases (#3463).</li>
+ <li>Fixed an AR bug with or_where_not_in() (#4171).</li>
<li>Fixed an AR bug when joining with a table alias and table prefix (#4400).</li>
<li>Fixed a bug in DB Forge, when inserting an id field (#3456).</li>
<li>Fixed a bug in the DB class testing the $params argument.</li>