Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-22 15:11:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8482a54a68396333e0b14a792a8c96720a97b59c' into v1.14.x

Browse Source
This commit is contained in:
Misty (Bot)
2020-06-24 14:36:51 +00:00
parent c07cca574f 8482a54a68
commit f01ac65c5a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/src/client/search.js
View File

@@ -188,15 +188,18 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo
confirmKeys: [13, 44],
trimValue: true,
});
autocomplete.user(userEl.siblings('.bootstrap-tagsinput').find('input'));
if (app.user.privileges['search:users']) {
autocomplete.user(userEl.siblings('.bootstrap-tagsinput').find('input'));
}
var tagEl = $('#has-tags');
tagEl.tagsinput({
confirmKeys: [13, 44],
trimValue: true,
});
autocomplete.tag(tagEl.siblings('.bootstrap-tagsinput').find('input'));
if (app.user.privileges['search:tags']) {
autocomplete.tag(tagEl.siblings('.bootstrap-tagsinput').find('input'));
}
}
return Search;

2
src/socket.io/user/profile.js
View File

@@ -162,7 +162,7 @@ module.exports = function (SocketUser) {
throw new Error('[[error:invalid-uid]]');
}
if (!data || !data.uid) {
if (!data || !(parseInt(data.uid, 10) > 0)) {
throw new Error('[[error:invalid-data]]');
}