summaryrefslogtreecommitdiff
path: root/includes/database
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2012-03-08 14:14:45 -0800
committerwebchick <webchick@24967.no-reply.drupal.org>2012-03-08 14:14:45 -0800
commita676b090506f8b5580808d8a6b08c3796488112d (patch)
treed6c631000af3fc044fdedcf4b70a91eaac49ccad /includes/database
parentb903eea5350f2e81d85dde361fe6ae88cc51bd1c (diff)
downloadbrdo-a676b090506f8b5580808d8a6b08c3796488112d.tar.gz
brdo-a676b090506f8b5580808d8a6b08c3796488112d.tar.bz2
Issue #1414412 by Damien Tournoud, pillarsdotnet, droplet, MrHaroldA: Fixed Skip #conjunction key in __clone() method of core/includes/database/query.inc.
Diffstat (limited to 'includes/database')
-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 6020b0ea5..750aea7a0 100644
--- a/includes/database/query.inc
+++ b/includes/database/query.inc
@@ -1898,7 +1898,7 @@ class DatabaseCondition implements QueryConditionInterface, Countable {
function __clone() {
$this->changed = TRUE;
foreach ($this->conditions as $key => $condition) {
- if ($condition['field'] instanceOf QueryConditionInterface) {
+ if ($key !== '#conjunction' && $condition['field'] instanceOf QueryConditionInterface) {
$this->conditions[$key]['field'] = clone($condition['field']);
}
}