diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2012-08-22 10:27:47 +0200 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-08-22 10:27:47 +0200 |
commit | 669b2682f307e2af1c8d33c365e2a0e486e389ee (patch) | |
tree | 883dcfbe5a94ab6d1319797aa6ff09648d06488b /includes/database/sqlite | |
parent | 101c75d3f114bf6b6abaf17865d2c4f98d3a0307 (diff) | |
download | brdo-669b2682f307e2af1c8d33c365e2a0e486e389ee.tar.gz brdo-669b2682f307e2af1c8d33c365e2a0e486e389ee.tar.bz2 |
Issue #1542186 by pp, redcell, rickmanelius: Fixed PHP 5.4 'Illegal string offset' warning when install.
Diffstat (limited to 'includes/database/sqlite')
-rw-r--r-- | includes/database/sqlite/query.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/includes/database/sqlite/query.inc b/includes/database/sqlite/query.inc index 74ff9ba20..f0ff10d7d 100644 --- a/includes/database/sqlite/query.inc +++ b/includes/database/sqlite/query.inc @@ -72,11 +72,13 @@ class UpdateQuery_sqlite extends UpdateQuery { */ protected function removeFieldsInCondition(&$fields, QueryConditionInterface $condition) { foreach ($condition->conditions() as $child_condition) { - if ($child_condition['field'] instanceof QueryConditionInterface) { - $this->removeFieldsInCondition($fields, $child_condition['field']); - } - else { - unset($fields[$child_condition['field']]); + if (isset($child_condition['field'])) { + if ($child_condition['field'] instanceof ConditionInterface) { + $this->removeFieldsInCondition($fields, $child_condition['field']); + } + else { + unset($fields[$child_condition['field']]); + } } } } |