diff options
| author | cash <cash.costello@gmail.com> | 2012-02-04 17:54:54 -0500 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2012-02-04 17:54:54 -0500 |
| commit | 187fcf6c98ae723d4fb296801cc91ce7092e62c0 (patch) | |
| tree | 7440411ae93504e368e54c111b7e27fd6359f0e8 /engine/classes/ElggEntity.php | |
| parent | c578c639527fad98ae60676ea58860809462d4dc (diff) | |
| download | elgg-187fcf6c98ae723d4fb296801cc91ce7092e62c0.tar.gz elgg-187fcf6c98ae723d4fb296801cc91ce7092e62c0.tar.bz2 | |
Fixes #2112 not loading data from entities table twice
Diffstat (limited to 'engine/classes/ElggEntity.php')
| -rw-r--r-- | engine/classes/ElggEntity.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php index 2fa8e9939..dc38dafbe 100644 --- a/engine/classes/ElggEntity.php +++ b/engine/classes/ElggEntity.php @@ -1311,12 +1311,16 @@ abstract class ElggEntity extends ElggData implements /** * Loads attributes from the entities table into the object. * - * @param int $guid GUID of Entity + * @param mixed $guid GUID of entity or stdClass object from entities table * * @return bool */ protected function load($guid) { - $row = get_entity_as_row($guid); + if ($guid instanceof stdClass) { + $row = $guid; + } else { + $row = get_entity_as_row($guid); + } if ($row) { // Create the array if necessary - all subclasses should test before creating |