From f5a31cc92c344fd2a3f149abf18d7154061262f7 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 16 Jan 2017 13:27:26 -0800
Subject: [PATCH] Fix for toAvatar() h parameter.

---
 e107_core/shortcodes/batch/admin_shortcodes.php | 2 +-
 e107_handlers/e_parse_class.php                 | 6 ++++++
 e107_themes/bootstrap3/admin_style.css          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index a2e68569d..4a8f51556 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -1776,7 +1776,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 				
 			$menu_vars['logout']['text'] = ''; // ADMINNAME; // ""; // ADMINNAME;
 			$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']['sub'] = $tmp;	
 		}
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 64a77c9f9..37e10e2fc 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -3655,6 +3655,12 @@ class e_parser
 		$linkStart  = '';
 		$linkEnd    =  '';
 
+		if(!empty($options['h']))
+		{
+			$height = intval($options['h']);
+		}
+
+
 		if($userData === null && USERID)
 		{
 			$userData = array();
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 3add010c2..f8a5a6285 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -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}