mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-10-09 12:06:29 +02:00
Code Issues Releases Wiki Activity

Issue #2259 - Avatar

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

38
e107_core/shortcodes/single/user_avatar.php
View File

@@ -2,20 +2,36 @@
// $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))
{ {
$data = array('user_image'=>$parm); if(is_numeric($parm))
} {
elseif(!empty($parm) && is_array($parm)) $id = intval($parm);
{ $data = e107::user($id);
$data = $parm; $parm = null;
} }
else if(is_string($parm))
{ {
$data = null; $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; global $loop_uid;

1
e107_core/xml/default_install.xml
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',

4
e107_handlers/e_parse_class.php
View File

@@ -3665,8 +3665,8 @@ class e_parser
$image = (!empty($userData['user_image'])) ? varset($userData['user_image']) : null; $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)) if (!empty($image))
{ {