mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-27 09:06:15 +01:00
fix: user urls in subfolder install
fix missing await
This commit is contained in:
@@ -137,7 +137,6 @@ module.exports = function (User) {
|
|||||||
|
|
||||||
async function getIPMatchedUsers(user) {
|
async function getIPMatchedUsers(user) {
|
||||||
const uids = await User.getUidsFromSet('ip:' + user.ip + ':uid', 0, -1);
|
const uids = await User.getUidsFromSet('ip:' + user.ip + ':uid', 0, -1);
|
||||||
const data = User.getUsersFields(uids, ['uid', 'username', 'picture']);
|
user.ipMatch = await User.getUsersFields(uids, ['uid', 'username', 'picture']);
|
||||||
user.ipMatch = data;
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
<tr data-id="{posts.id}">
|
<tr data-id="{posts.id}">
|
||||||
<td class="col-md-1">
|
<td class="col-md-1">
|
||||||
<!-- IF posts.user.userslug -->
|
<!-- IF posts.user.userslug -->
|
||||||
<a href="/uid/{posts.user.uid}">{posts.user.username}</a>
|
<a href="{config.relative_path}/uid/{posts.user.uid}">{posts.user.username}</a>
|
||||||
<!-- ELSE -->
|
<!-- ELSE -->
|
||||||
{posts.user.username}
|
{posts.user.username}
|
||||||
<!-- ENDIF posts.user.userslug -->
|
<!-- ENDIF posts.user.userslug -->
|
||||||
|
|||||||
@@ -62,7 +62,7 @@
|
|||||||
<!-- ELSE -->
|
<!-- ELSE -->
|
||||||
<div class="user-img avatar avatar-sm" style="background-color: {users.ipMatch.icon:bgColor};">{users.ipMatch.icon:text}</div>
|
<div class="user-img avatar avatar-sm" style="background-color: {users.ipMatch.icon:bgColor};">{users.ipMatch.icon:text}</div>
|
||||||
<!-- ENDIF users.ipMatch.picture -->
|
<!-- ENDIF users.ipMatch.picture -->
|
||||||
<a href="/uid/{users.ipMatch.uid}">{users.ipMatch.username}</a>
|
<a href="{config.relative_path}/uid/{users.ipMatch.uid}">{users.ipMatch.username}</a>
|
||||||
<!-- END users.ipMatch -->
|
<!-- END users.ipMatch -->
|
||||||
</td>
|
</td>
|
||||||
<td class="hidden-xs">
|
<td class="hidden-xs">
|
||||||
|
|||||||
Reference in New Issue
Block a user