Merge branch 'master' of https://github.com/NodeBB/NodeBB

install/package.json

@@ -70,7 +70,7 @@
         "nodebb-plugin-dbsearch": "2.0.21",
         "nodebb-plugin-emoji": "^2.2.5",
         "nodebb-plugin-emoji-android": "2.0.0",
-        "nodebb-plugin-markdown": "8.7.2",
+        "nodebb-plugin-markdown": "8.7.3",
         "nodebb-plugin-mentions": "2.2.8",
         "nodebb-plugin-soundpack-default": "1.0.0",
         "nodebb-plugin-spam-be-gone": "0.5.4",

public/language/en-GB/admin/manage/categories.json

@@ -68,5 +68,6 @@
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
 	"collapse-all": "Collapse All",
-	"expand-all": "Expand All"
+	"expand-all": "Expand All",
+	"disable-on-create": "Disable on create"
 }

public/language/en-GB/modules.json

@@ -48,6 +48,7 @@
 	"composer.formatting.italic": "Italic",
 	"composer.formatting.list": "List",
 	"composer.formatting.strikethrough": "Strikethrough",
+	"composer.formatting.code": "Code",
 	"composer.formatting.link": "Link",
 	"composer.formatting.picture": "Picture",
 	"composer.upload-picture": "Upload Image",

src/categories/create.js

@@ -35,7 +35,7 @@ module.exports = function (Categories) {
 					parentCid: parentCid,
 					topic_count: 0,
 					post_count: 0,
-					disabled: 0,
+					disabled: data.disabled ? 1 : 0,
 					order: order,
 					link: data.link || '',
 					numRecentReplies: 1,

src/controllers/admin/privileges.js

@@ -2,6 +2,7 @@
 
 var async = require('async');
 
+var db = require('../../database');
 var categories = require('../../categories');
 var privileges = require('../../privileges');
 
@@ -19,7 +20,19 @@ privilegesController.get = function (req, res, callback) {
 						privileges.categories.list(cid, next);
 					}
 				},
-				allCategories: async.apply(categories.buildForSelect, req.uid, 'read'),
+				allCategories: function (next) {
+					async.waterfall([
+						function (next) {
+							db.getSortedSetRange('cid:0:children', 0, -1, next);
+						},
+						function (cids, next) {
+							categories.getCategories(cids, req.uid, next);
+						},
+						function (categoriesData, next) {
+							categories.buildForSelectCategories(categoriesData, next);
+						},
+					], next);
+				},
 			}, next);
 		},
 		function (data) {

src/upgrades/1.7.6/update_min_pass_strength.js

@@ -6,7 +6,7 @@ var async = require('async');
 
 module.exports = {
 	name: 'Revising minimum password strength to 1 (from 0)',
-	timestamp: Date.UTC(2017, 1, 21),
+	timestamp: Date.UTC(2018, 1, 21),
 	method: function (callback) {
 		async.waterfall([
 			async.apply(db.getObjectField.bind(db), 'config', 'minimumPasswordStrength'),

src/upgrades/1.8.1/diffs_zset_to_listhash.js

@@ -7,7 +7,7 @@ var async = require('async');
 
 module.exports = {
 	name: 'Reformatting post diffs to be stored in lists and hash instead of single zset',
-	timestamp: Date.UTC(2017, 2, 15),
+	timestamp: Date.UTC(2018, 2, 15),
 	method: function (callback) {
 		var progress = this.progress;
 

src/views/admin/partials/categories/create.tpl

@@ -25,6 +25,13 @@
 			<input id="cloneChildren" name="cloneChildren" type="checkbox">
 			<strong>[[admin/manage/categories:clone-children]]</strong>
 		</label>
-
 	</div>
+
+	<div class="form-group">
+		<label>
+			<input id="disabled" name="disabled" type="checkbox">
+			<strong>[[admin/manage/categories:disable-on-create]]</strong>
+		</label>
+	</div>
+
 </form>

src/widgets/index.js

@@ -51,7 +51,9 @@ widgets.render = function (uid, options, callback) {
 					if (err) {
 						return done(err);
 					}
-					returnData[location] = renderedWidgets.filter(Boolean);
+					renderedWidgets = renderedWidgets.filter(Boolean);
+					returnData[location] = renderedWidgets.length ? renderedWidgets : undefined;
+
 					done();
 				});
 			}, function (err) {