Index: trunk/kernel/include/image.php
===================================================================
diff -u -r1054 -r1067
--- trunk/kernel/include/image.php	(.../image.php)	(revision 1054)
+++ trunk/kernel/include/image.php	(.../image.php)	(revision 1067)
@@ -898,8 +898,26 @@
 		}
 		else
 		return FALSE;
-
 	}
+	
+	function &GetAvatarImage($ResourceId)
+	{
+		$sql = 'SELECT * FROM '.$this->SourceTable.
+				' WHERE ResourceId='.$ResourceId.' AND Name="avatar" AND Enabled=1
+				LIMIT 1';
+		$rs = $this->adodbConnection->Execute($sql);
+		if($rs && ! $rs->EOF)
+		{
+			$data = $rs->fields;
+			$img= new clsImage();
+			$img->SetFromArray($data);
+			$img->Clean();
+			return $img;
+		}
+		else
+		return FALSE;
+	}
+	
 	function HandleImageUpload($FILE,$ResourceId,$RelatedTo,$DestDir, $Name="",$AltName="",$IsThumb=0)
 	{
 		global $objConfig;
Index: trunk/kernel/include/item.php
===================================================================
diff -u -r1040 -r1067
--- trunk/kernel/include/item.php	(.../item.php)	(revision 1040)
+++ trunk/kernel/include/item.php	(.../item.php)	(revision 1067)
@@ -513,6 +513,11 @@
 	{
 		return $this->Images->GetDefaultImage($this->Get("ResourceId"));
 	}
+	
+	function &GetAvatarImage()
+	{
+		return $this->Images->GetAvatarImage($this->Get("ResourceId"));
+	}
 
 	function CreatePendingCopy()
 	{
Index: trunk/kernel/include/portaluser.php
===================================================================
diff -u -r1020 -r1067
--- trunk/kernel/include/portaluser.php	(.../portaluser.php)	(revision 1020)
+++ trunk/kernel/include/portaluser.php	(.../portaluser.php)	(revision 1067)
@@ -10,7 +10,8 @@
 
     function clsPortalUser($UserId=NULL)
     {
-        $this->clsParsedItem();
+ //     $this->clsParsedItem();
+        $this->clsItem();
         $this->tablename=GetTablePrefix()."PortalUser";
         $this->type=6;
         $this->BasePermission="USER";
@@ -313,6 +314,7 @@
         global $objConfig, $objUsers, $objCatList,$objSession, $var_list_update, $var_list, $m_var_list_update;
         //echo "<PRE>"; print_r($element); echo "</pre>";
         //echo "Tag Prefix: ".$this->TagPrefix." Element: ".$element->name."<br>";
+        $this->clsPortalUser();
         if (strtolower($element->name) == 'touser') {
         	$this->TagPrefix = "touser";
         }
@@ -550,19 +552,24 @@
   				@attrib:_name::Return the image with this name
   				@attrib:_thumbnail:bool:If true, return the thumbnail version of the image
   				@attrib:_imagetag:bool:If true, returns a complete image tag. exta html attributes are passed to the image tag
-               */               
+               */    
+               $avatar = $element->attributes["_avatar"];         
                $default = $element->attributes["_primary"];
                $name = $element->attributes["_name"];
-               if(strlen($name))
+               if ($avatar) 
                {
+               		$img = $this->GetAvatarImage();
+               }
+               elseif(strlen($name))
+               {
                    $img = $this->GetImageByName($name);
                   // echo "<PRE>";print_r($img); echo "</PRE>";
                }
-               else
-               {
-                   if($default)
-                     $img = $this->GetDefaultImage();                        
-               }
+               elseif ($default) 
+           	   {
+                 	$img = $this->GetDefaultImage();
+           	   }
+               
                if($img)
                {
                    if($element->attributes["_thumbnail"])