Marcus Povey <marcus@dushka.co.uk>

* Annotations and metadata now imported

git-svn-id: https://code.elgg.org/elgg/trunk@393 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 21 insertions, 10 deletions

diff --git a/engine/lib/extender.php b/engine/lib/extender.php
index f15aaa1ee..4f588acdd 100644
--- a/engine/lib/extender.php
+++ b/engine/lib/extender.php
@@ -75,6 +75,7 @@
 			$tmp = new stdClass;
 			$tmp->attributes = $this->attributes;
 			$tmp->attributes['owner_uuid'] = guid_to_uuid($this->owner_guid);
+			$tmp->attributes['entity_uuid'] = guid_to_uuid($this->entity_guid);
 			return $tmp;
 		}
 		
@@ -92,20 +93,30 @@
 					
 					switch ($name)
 					{
+						case 'id' : break;
 						case 'entity_uuid' : $entity_uuid = $text; break;
 						default : $this->attributes[$name] = $text;
 					}
-					
-					// See if this entity has already been imported, if so then we need to link to it
-					$entity = get_entity_from_uuid($entity_uuid);
-					if (!$entity)
-						throw new ImportException("Sorry $entity_uuid was not found. Could not import annotation.");
-					
-					// Set owner ID
-					$this->attributes['owner_guid'] = $entity->getGUID();
-					
-					return $this;
+
 				}
+				// See if this entity has already been imported, if so then we need to link to it
+				$entity = get_entity_from_uuid($entity_uuid);
+				if (!$entity)
+					throw new ImportException("Sorry $entity_uuid was not found. Could not import annotation.");
+				
+				// Set the item ID
+				$this->attributes['entity_guid'] = $entity->getGUID();
+				
+				// Set owner
+				$this->attributes[$name] = $entity->getOwner(); 
+				
+				// save
+				$result = $this->save(); 
+				if (!$result)
+					throw new ImportException("There was a problem saving the ElggExtender");
+				
+				return $this;
+				
 			}
 			else
 				throw new ImportException("Unsupported version ($version) passed to ElggAnnotation::import()");