]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Fixes #3246 fixed ElggMetadata() constructor
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 26 Mar 2011 17:48:45 +0000 (17:48 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 26 Mar 2011 17:48:45 +0000 (17:48 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8849 36083f99-b078-4883-b0ff-0f9b5a30f544

engine/classes/ElggMetadata.php

index f85bac6ceeb0c5acfc75da3378a01dde3ecd8de9..135c170281393985b0e14f42ef0a479696cab34d 100644 (file)
@@ -29,15 +29,15 @@ class ElggMetadata extends ElggExtender {
                        // Create from db row
                        if ($id instanceof stdClass) {
                                $metadata = $id;
-                       } else {
-                               $metadata = elgg_get_metadata_from_id($id);
-                       }
-
-                       if ($metadata) {
+                               
                                $objarray = (array) $metadata;
                                foreach ($objarray as $key => $value) {
                                        $this->attributes[$key] = $value;
                                }
+                       } else {
+                               // get an ElggMetadata object and copy its attributes
+                               $metadata = elgg_get_metadata_from_id($id);
+                               $this->attributes = $metadata->attributes;
                        }
                }
        }