making sure ElggEntity::getAnnotations() returns an array, check if temporary annotation exists before returning, and added a warning about annotating unsaved entities

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

1 files changed, 6 insertions, 1 deletions

diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index cfdaede71..31885ad25 100644
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -717,6 +717,9 @@ abstract class ElggEntity extends ElggData implements
 	 *
 	 * @warning By default, annotations are private.
 	 *
+	 * @warning Annotating an unsaved entity more than once with the same name
+	 *          will only save the last annotation.
+	 *
 	 * @param string $name      Annotation name
 	 * @param mixed  $value     Annotation value
 	 * @param int    $access_id Access ID
@@ -761,8 +764,10 @@ abstract class ElggEntity extends ElggData implements
 			}
 
 			return elgg_get_annotations($options);
+		} else if (isset($this->temp_annotations[$name])) {
+			return array($this->temp_annotations[$name]);
 		} else {
-			return $this->temp_annotations[$name];
+			return array();
 		}
 	}