diff options
| author | Cash Costello <cash.costello@gmail.com> | 2013-05-06 04:28:03 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2013-05-06 04:28:03 -0700 |
| commit | 835626750756b6af38c0d9435c8477f23d494cda (patch) | |
| tree | e85bf4696e250cb0556453cb80fc34fdc54d7409 /engine/classes | |
| parent | 0726860ca04b4f2ed9b010cc5c5692c23c32e2d2 (diff) | |
| parent | 8585af507a98ba1124220b9c266a8377aa490693 (diff) | |
| download | elgg-835626750756b6af38c0d9435c8477f23d494cda.tar.gz elgg-835626750756b6af38c0d9435c8477f23d494cda.tar.bz2 | |
Merge pull request #5436 from mrclay/5435
Fixes #5435: Allows upgrade to boot on old schemas
Diffstat (limited to 'engine/classes')
| -rw-r--r-- | engine/classes/ElggAttributeLoader.php | 7 |
1 files 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']; |