summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries <dries@buytaert.net>2011-12-19 09:41:16 -0500
committerDries <dries@buytaert.net>2011-12-19 09:41:16 -0500
commitba3e11f132e3e467408e6929342f1df0b0105f7a (patch)
treeb7ac8c71fe349cb9f0e036686088cdfb29096777 /includes
parentee6826fc164a012bf2d3f14de69e4f48c849647c (diff)
parent9e12767c75191b440086a6a54f1d470a1b550332 (diff)
downloadbrdo-ba3e11f132e3e467408e6929342f1df0b0105f7a.tar.gz
brdo-ba3e11f132e3e467408e6929342f1df0b0105f7a.tar.bz2
Merge branch '7.x' of git.drupal.org:project/drupal into 7.x
Diffstat (limited to 'includes')
-rw-r--r--includes/database/query.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/includes/database/query.inc b/includes/database/query.inc
index 9cdd8784e..c77968767 100644
--- a/includes/database/query.inc
+++ b/includes/database/query.inc
@@ -1704,6 +1704,9 @@ class DatabaseCondition implements QueryConditionInterface, Countable {
if (is_array($value)) {
$operator = 'IN';
}
+ elseif (!isset($value)) {
+ $operator = 'IS NULL';
+ }
else {
$operator = '=';
}
@@ -1737,7 +1740,7 @@ class DatabaseCondition implements QueryConditionInterface, Countable {
* Implements QueryConditionInterface::isNull().
*/
public function isNull($field) {
- return $this->condition($field, NULL, 'IS NULL');
+ return $this->condition($field);
}
/**