summaryrefslogtreecommitdiff
path: root/includes/database/query.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-06-27 09:41:56 +0000
committerDries Buytaert <dries@buytaert.net>2009-06-27 09:41:56 +0000
commit7613aa590880c0ed2397e04cc7b17efdca2169e3 (patch)
tree204ad08b719d976e2603792775d8eeeac29f3cf6 /includes/database/query.inc
parentc25f3ac5dfb862def561937319bef45a2264ede8 (diff)
downloadbrdo-7613aa590880c0ed2397e04cc7b17efdca2169e3.tar.gz
brdo-7613aa590880c0ed2397e04cc7b17efdca2169e3.tar.bz2
- Patch #369314 by Berdir: make sub-selects work.
Diffstat (limited to 'includes/database/query.inc')
-rw-r--r--includes/database/query.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/database/query.inc b/includes/database/query.inc
index f1aed5e52..b27eb6a0c 100644
--- a/includes/database/query.inc
+++ b/includes/database/query.inc
@@ -1179,6 +1179,7 @@ class DatabaseCondition implements QueryConditionInterface, Countable {
}
$operator += $operator_defaults;
+ $placeholders = array();
if ($condition['value'] instanceof SelectQuery) {
$placeholders[] = (string)$condition['value'];
$arguments += $condition['value']->arguments();
@@ -1189,7 +1190,6 @@ class DatabaseCondition implements QueryConditionInterface, Countable {
elseif (!$operator['delimiter']) {
$condition['value'] = array($condition['value']);
}
- $placeholders = array();
if ($operator['use_value']) {
foreach ($condition['value'] as $value) {
$placeholder = ':db_condition_placeholder_' . $next_placeholder++;