1
0
mirror of https://github.com/e107inc/e107.git synced 2025-10-09 20:18:08 +02:00

Issue #2259 - Avatar

This commit is contained in:
Cameron
2017-01-09 11:52:12 -08:00
parent 0fcba42399
commit f55e57db3d
3 changed files with 30 additions and 13 deletions

View File

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

View File

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