mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-24 00:09:41 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -31,6 +31,8 @@ define('forum/topic/delete-posts', [
|
||||
postSelect.init(function () {
|
||||
checkButtonEnable();
|
||||
showPostsSelected();
|
||||
}, {
|
||||
allowMainPostSelect: true,
|
||||
});
|
||||
showPostsSelected();
|
||||
|
||||
|
||||
@@ -151,7 +151,15 @@ module.exports = function (Categories) {
|
||||
}
|
||||
|
||||
async function generateHandle(slug) {
|
||||
let taken = await meta.slugTaken(slug);
|
||||
let taken;
|
||||
try {
|
||||
taken = await meta.slugTaken(slug);
|
||||
} catch (e) {
|
||||
// invalid slug passed in
|
||||
slug = 'category';
|
||||
taken = true;
|
||||
}
|
||||
|
||||
let suffix;
|
||||
while (taken) {
|
||||
suffix = utils.generateUUID().slice(0, 8);
|
||||
|
||||
Reference in New Issue
Block a user