From 8585af507a98ba1124220b9c266a8377aa490693 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Sun, 5 May 2013 17:55:27 -0400 Subject: Fixes #5435: Allows upgrade to boot on old schemas --- engine/classes/ElggAttributeLoader.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/engine/classes/ElggAttributeLoader.php b/engine/classes/ElggAttributeLoader.php index d1e15008e..b91e4b88a 100644 --- a/engine/classes/ElggAttributeLoader.php +++ b/engine/classes/ElggAttributeLoader.php @@ -209,11 +209,8 @@ class ElggAttributeLoader { } } - // loading complete: re-check missing and check type - if (($was_missing_primaries && $this->isMissingPrimaries($row)) - || ($was_missing_secondaries && $this->isMissingSecondaries($row))) { - throw new LogicException('Attribute loaders failed to return proper attributes'); - } + // Note: If there are still missing attributes, we're running on a 1.7 or earlier schema. We let + // this pass so the upgrades can run. // guid needs to be an int http://trac.elgg.org/ticket/4111 $row['guid'] = (int) $row['guid']; -- cgit v1.2.3