From 6b11350d32b753a45f4814325bdcd8aafd163050 Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Mon, 5 Nov 2012 22:56:05 -0500
Subject: Rolled back issue #1542186 (PHP 5.4 'Illegal string offset' warning
 when installing on SQLite), since the fix was broken.

---
 includes/database/sqlite/query.inc | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'includes/database/sqlite')

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']]);
       }
     }
   }
-- 
cgit v1.2.3