diff options
author | David Rothstein <drothstein@gmail.com> | 2012-11-05 22:56:05 -0500 |
---|---|---|
committer | David Rothstein <drothstein@gmail.com> | 2012-11-05 22:56:05 -0500 |
commit | 6b11350d32b753a45f4814325bdcd8aafd163050 (patch) | |
tree | ee10fd197bf002953ff6a4196a03262236055fe4 /includes/database/sqlite | |
parent | 735adae7f3051b4e1701dd46fd11944f66fb5849 (diff) | |
download | brdo-6b11350d32b753a45f4814325bdcd8aafd163050.tar.gz brdo-6b11350d32b753a45f4814325bdcd8aafd163050.tar.bz2 |
Rolled back issue #1542186 (PHP 5.4 'Illegal string offset' warning when installing on SQLite), since the fix was broken.
Diffstat (limited to 'includes/database/sqlite')
-rw-r--r-- | includes/database/sqlite/query.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/includes/database/sqlite/query.inc b/includes/database/sqlite/query.inc index f0ff10d7d..74ff9ba20 100644 --- a/includes/database/sqlite/query.inc +++ b/includes/database/sqlite/query.inc @@ -72,13 +72,11 @@ class UpdateQuery_sqlite extends UpdateQuery { */ protected function removeFieldsInCondition(&$fields, QueryConditionInterface $condition) { foreach ($condition->conditions() as $child_condition) { - if (isset($child_condition['field'])) { - if ($child_condition['field'] instanceof ConditionInterface) { - $this->removeFieldsInCondition($fields, $child_condition['field']); - } - else { - unset($fields[$child_condition['field']]); - } + if ($child_condition['field'] instanceof QueryConditionInterface) { + $this->removeFieldsInCondition($fields, $child_condition['field']); + } + else { + unset($fields[$child_condition['field']]); } } } |