makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 6 additions and 4 deletions
Show stats 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({ $(txtarea).atwho({
at: "@", at: "@",
displayTpl: function(data) { 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>" : ''; 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>"; 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, limit: mentionNamesLimit,
callbacks: { callbacks: {
remoteFilter: function(query, callback) { 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) callback(data)
}); });
} }

2
phpBB/phpbb/mention/source/base_group.php
View file

@ -137,7 +137,7 @@ abstract class base_group implements source_interface
'id' => $group_id, 'id' => $group_id,
'avatar' => [ 'avatar' => [
'type' => 'group', 'type' => 'group',
'src' => phpbb_get_group_avatar($groups[$group_id]), 'img' => phpbb_get_group_avatar($groups[$group_id]),
], ],
'rank' => $group_rank['title'], 'rank' => $group_rank['title'],
]; ];

2
phpBB/phpbb/mention/source/base_user.php
View file

@ -74,7 +74,7 @@ abstract class base_user implements source_interface
'id' => $row['user_id'], 'id' => $row['user_id'],
'avatar' => [ 'avatar' => [
'type' => 'user', 'type' => 'user',
'src' => $this->user_loader->get_avatar($row['user_id'], true), 'img' => $this->user_loader->get_avatar($row['user_id'], true),
], ],
'rank' => (isset($user_rank['rank_title'])) ? $user_rank['rank_title'] : '', 'rank' => (isset($user_rank['rank_title'])) ? $user_rank['rank_title'] : '',
]; ];