From 5cc14c86ae1a2a73cb3f58a745aacfd38eceb979 Mon Sep 17 00:00:00 2001
From: lonalore <lonalore@freemail.hu>
Date: Tue, 31 Oct 2017 10:19:09 +0100
Subject: [PATCH] Fix for issue #2835.

---
 e107_web/js/core/mediaManager.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index 9e5b1a8be..c3c048ea3 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -320,23 +320,27 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
 		$this.addClass('media-select-active');
 		$this.closest('img').addClass('active');
 
-		if(bbcode == "file") // not needed for Tinymce
+		if(bbcode == "file" && $bbcodeHolder.length > 0) // not needed for Tinymce
 		{
 			bbpath = '[file=' + id + ']' + name + '[/file]';
-
-			if($bbcodeHolder.length > 0)
-			{
-				$bbcodeHolder.val(bbpath);
-			}
+			$bbcodeHolder.val(bbpath);
 			return;
 		}
 
-		if(bbcode == "video" || bbcode == 'glyph')
+		if(bbcode == "video" && $bbcodeHolder.length > 0)
 		{
 			bbpath = '[' + bbcode + ']' + path + '[/' + bbcode + ']';
+			$bbcodeHolder.val(bbpath);
+		}
 
-			if($bbcodeHolder.length > 0)
+		if(bbcode == "glyph" && $bbcodeHolder.length > 0)
+		{
+			var $target = $('div#' + target + "_prev", window.top.document);
+
+			// Only if  the triggering element is not an icon-picker.
+			if($target.length == 0 || !$target.hasClass('image-selector'))
 			{
+				bbpath = '[' + bbcode + ']' + path + '[/' + bbcode + ']';
 				$bbcodeHolder.val(bbpath);
 			}
 		}