mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Fix for toAvatar() h parameter.

Browse Source
This commit is contained in:
Cameron
2017-01-16 13:27:26 -08:00
parent d7d324d365
commit f5a31cc92c
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1776,7 +1776,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$menu_vars['logout']['text'] = ''; // ADMINNAME; // ""; // ADMINNAME; $menu_vars['logout']['text'] = ''; // ADMINNAME; // ""; // ADMINNAME;
$menu_vars['logout']['link'] = '#'; $menu_vars['logout']['link'] = '#';
$menu_vars['logout']['image'] = $tp->toAvatar(null, array('w'=>32,'h'=>32, 'shape'=>'circle')); // $tp->toGlyph('fa-user'); // "<i class='icon-user'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />"; $menu_vars['logout']['image'] = $tp->toAvatar(null, array('w'=>30,'h'=>30,'crop'=>1, 'shape'=>'circle')); // $tp->toGlyph('fa-user'); // "<i class='icon-user'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
$menu_vars['logout']['image_src'] = LAN_LOGOUT; $menu_vars['logout']['image_src'] = LAN_LOGOUT;
$menu_vars['logout']['sub'] = $tmp; $menu_vars['logout']['sub'] = $tmp;
} }

6
e107_handlers/e_parse_class.php
View File

@@ -3655,6 +3655,12 @@ class e_parser
$linkStart = ''; $linkStart = '';
$linkEnd = ''; $linkEnd = '';
if(!empty($options['h']))
{
$height = intval($options['h']);
}
if($userData === null && USERID) if($userData === null && USERID)
{ {
$userData = array(); $userData = array();

2
e107_themes/bootstrap3/admin_style.css
View File

@@ -1305,7 +1305,7 @@ td.forumheader { background-image: linear-gradient(#303030,#212121 60%,#171717);
.navbar-nav > li > a.admin-icon-avatar { padding-top:8px; padding-bottom:5px} .navbar-nav > li > a.admin-icon-avatar { padding-top:9px; padding-bottom:5px}