Issue #2259 - Avatar

e107_core/shortcodes/single/user_avatar.php

@@ -2,20 +2,36 @@
 // $Id$
 function user_avatar_shortcode($parm=null)
 {
-	if(!empty($parm) && is_string($parm))
+	$data = null;
+
+	if(!empty($parm))
 	{
-		$data = array('user_image'=>$parm);
-	}
-	elseif(!empty($parm) && is_array($parm))
-	{
-		$data = $parm;
-	}
-	else
-	{
-		$data = null;
+		if(is_numeric($parm))
+		{
+			$id = intval($parm);
+			$data = e107::user($id);
+			$parm = null;
+		}
+		if(is_string($parm))
+		{
+			$data = array('user_image'=>$parm);
+		}
+		elseif(is_array($parm))
+		{
+			if(isset($parm['user_image']))
+			{
+				$data = $parm;
+			}
+			else
+			{
+				$data = null;
+			}
+
+		}
 	}
 
-	return e107::getParser()->toAvatar($data, $data);
+
+	return e107::getParser()->toAvatar($data, $parm);
 /*
 	global $loop_uid;
 

e107_core/xml/default_install.xml

@@ -96,6 +96,7 @@
 		<core name="e_meta_list"><![CDATA[array (
   'rss_menu' => 'rss_menu',
 )]]></core>
+	<core name="e_module_list"><![CDATA[array ()]]></core>
 		<core name="e_related_list"><![CDATA[array (
   'news' => 'news',
   'page' => 'page',

e107_handlers/e_parse_class.php

@@ -3665,8 +3665,8 @@ class e_parser
 
 		
 		$image = (!empty($userData['user_image'])) ? varset($userData['user_image']) : null;
-		
-		$genericImg = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","w=".$width."&h=".$height,true);	
+
+		$genericImg = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","w=".$width."&h=".$height,true);
 		
 		if (!empty($image)) 
 		{