From 63b5cb4fc688f9da2984c4c10439dba3a432633a Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Sep 2018 15:46:37 +0000
Subject: [PATCH] Issue 5721: Temporarily deactivate the picture upload from
 private mails

---
 view/js/main.js                           | 5 +++++
 view/theme/frio/templates/prv_message.tpl | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/view/js/main.js b/view/js/main.js
index 4ccbc8044e..83086c82b0 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -81,6 +81,11 @@ $(function() {
 			Dialog.doImageBrowser("comment", id);
 			return;
 		}
+
+		if (bbcode == "imgprv") {
+			bbcode = "img";
+		}
+
 		insertFormatting(bbcode, id);
 	});
 
diff --git a/view/theme/frio/templates/prv_message.tpl b/view/theme/frio/templates/prv_message.tpl
index 4c90dcae6d..9077c4d4c1 100644
--- a/view/theme/frio/templates/prv_message.tpl
+++ b/view/theme/frio/templates/prv_message.tpl
@@ -33,7 +33,7 @@
 
 	<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 				<li>
-					<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
+					<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="imgprv" data-id="input">
 						<i class="fa fa-picture-o" aria-hidden="true"></i>
 					</button>
 				</li>