summaryrefslogtreecommitdiff
path: root/includes/database/query.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-07-19 21:05:46 +0000
committerDries Buytaert <dries@buytaert.net>2010-07-19 21:05:46 +0000
commit83f4ef42f6eacca66708fc24bc63cff11accaaa1 (patch)
treee45f0cea0fc9e5daf2ca6ddac71642d82224e334 /includes/database/query.inc
parenta5f23317ef61276828386d90bd7787580b5b9ea9 (diff)
downloadbrdo-83f4ef42f6eacca66708fc24bc63cff11accaaa1.tar.gz
brdo-83f4ef42f6eacca66708fc24bc63cff11accaaa1.tar.bz2
- Patch #851100 by Damien Tournoud: subquery objects are iterated upon.
Diffstat (limited to 'includes/database/query.inc')
-rw-r--r--includes/database/query.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/includes/database/query.inc b/includes/database/query.inc
index 55c569e00..75f292cfe 100644
--- a/includes/database/query.inc
+++ b/includes/database/query.inc
@@ -1321,6 +1321,9 @@ class DatabaseCondition implements QueryConditionInterface, Countable {
$condition['value']->compile($connection, $queryPlaceholder);
$placeholders[] = (string) $condition['value'];
$arguments += $condition['value']->arguments();
+ // Subqueries are the actual value of the operator, we don't
+ // need to add another below.
+ $operator['use_value'] = FALSE;
}
// We assume that if there is a delimiter, then the value is an
// array. If not, it is a scalar. For simplicity, we first convert