mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 05:36:30 +02:00
Code Issues Releases Wiki Activity

[ticket/13713] Fix avatars

Browse Source 
PHPBB3-13713
This commit is contained in:
lavigor
2018-07-04 01:37:35 +03:00
committed by Marc Alexander
parent c66f4806e8
commit 6d849f2cce
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/assets/javascript/editor.js
View File

@ -402,7 +402,8 @@ function getCaretPosition(txtarea) {
$(txtarea).atwho({
at: "@",
displayTpl: function(data) {
let avatar = (data.avatar.src) ? "<img src='" + data.avatar.src + "' class='mention-media-avatar'>" : defaultAvatar(data.avatar.type),
// TODO: handle image scaling
let avatar = (data.avatar.img) ? "<span class='mention-media-avatar'>" + data.avatar.img + "</span>" : defaultAvatar(data.avatar.type),
rank = (data.rank) ? "<span class='mention-rank'>" + data.rank + "</span>" : '';
return "<li class='mention-item'><span class='mention-media'>" + avatar + "</span><span class='mention-name'>" + data.name + rank + "</span></li>";
},
@ -410,7 +411,8 @@ function getCaretPosition(txtarea) {
limit: mentionNamesLimit,
callbacks: {
remoteFilter: function(query, callback) {
$.getJSON(mentionURL, {keyword: query, topic_id: mentionTopicId}, function (data) {
let params = {keyword: query, topic_id: mentionTopicId, _referer: location.href};
$.getJSON(mentionURL, params, function (data) {
callback(data)
});
}