Fixes #5435: Allows upgrade to boot on old schemas

diff --git a/engine/classes/ElggAttributeLoader.php b/engine/classes/ElggAttributeLoader.php
index d1e15008e3d9965083bb773201a3eed9ff45eccb..b91e4b88a5549557f1a2e7abc6e866859d2c9553 100644 (file)
--- 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'];