clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5760 from annando/issue-5721 

Issue 5721: Temporarily deactivate the picture upload from private mails
This commit is contained in:
rabuzarus 2018-09-13 18:35:00 +02:00 committed by GitHub
parent 70c94abd8e 63b5cb4fc6
commit 4079524f78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
view/js/main.js
View File

@ -81,6 +81,11 @@ $(function() {
Dialog.doImageBrowser("comment", id);
return;
}
if (bbcode == "imgprv") {
bbcode = "img";
}
insertFormatting(bbcode, id);
});

2
view/theme/frio/templates/prv_message.tpl
View File

@ -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>