Marcus Povey <marcus@dushka.co.uk>

* Fixed get/sets

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

1 files changed, 8 insertions, 6 deletions

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 8a0438383..e73e04889 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -31,6 +31,8 @@
 		 */
 		function __construct($id = null) 
 		{
+			$this->attributes = array();
+			
 			if (!empty($id)) {
 				if ($id instanceof stdClass)
 					$annotation = $id;
@@ -47,23 +49,23 @@
 		}
 		
 		function __get($name) {
-			if (isset($attributes[$name])) {
+			if (isset($this->attributes[$name])) {
 				
 				// Sanitise outputs if required
 				if ($name=='value')
 				{
-					switch ($attributes['value_type'])
+					switch ($this->attributes['value_type'])
 					{
-						case 'integer' :  return (int)$attributes['value'];
+						case 'integer' :  return (int)$this->attributes['value'];
 						case 'tag' :
 						case 'text' :
-						case 'file' : return sanitise_string($attributes['value']);
+						case 'file' : return sanitise_string($this->attributes['value']);
 							
-						default : throw new InstallationException("Type {$attributes['value_type']} is not supported. This indicates an error in your installation, most likely caused by an incomplete upgrade.");
+						default : throw new InstallationException("Type {$this->attributes['value_type']} is not supported. This indicates an error in your installation, most likely caused by an incomplete upgrade.");
 					}
 				}
 				
-				return $attributes[$name];
+				return $this->attributes[$name];
 			}
 			return null;
 		}