Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-23 08:50:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed regression introduced by #2080, closed #3189

Browse Source
This commit is contained in:
Julian Lam
2015-05-27 19:08:59 -04:00
parent f9053c077d
commit 463c893c3d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/categories.js
View File

@@ -244,7 +244,7 @@ var async = require('async'),
if (categories[i]) { if (categories[i]) {
categories[i]['unread-class'] = (parseInt(categories[i].topic_count, 10) === 0 || (hasRead[i] && uid !== 0)) ? '' : 'unread'; categories[i]['unread-class'] = (parseInt(categories[i].topic_count, 10) === 0 || (hasRead[i] && uid !== 0)) ? '' : 'unread';
categories[i].children = results.children[i]; categories[i].children = results.children[i];
categories[i].parent = results.parents[i] && !results.parents[i].disabled ? results.parents[i] : null; categories[i].parent = results.parents[i] || undefined;
calculateTopicPostCount(categories[i]); calculateTopicPostCount(categories[i]);
} }
} }

4
src/controllers/helpers.js
View File

@@ -57,15 +57,17 @@ helpers.buildCategoryBreadcrumbs = function(cid, callback) {
async.whilst(function() { async.whilst(function() {
return parseInt(cid, 10); return parseInt(cid, 10);
}, function(next) { }, function(next) {
categories.getCategoryFields(cid, ['name', 'slug', 'parentCid'], function(err, data) { categories.getCategoryFields(cid, ['name', 'slug', 'parentCid', 'disabled'], function(err, data) {
if (err) { if (err) {
return next(err); return next(err);
} }
if (!parseInt(data.disabled, 10)) {
breadcrumbs.unshift({ breadcrumbs.unshift({
text: validator.escape(data.name), text: validator.escape(data.name),
url: nconf.get('relative_path') + '/category/' + data.slug url: nconf.get('relative_path') + '/category/' + data.slug
}); });
}
cid = data.parentCid; cid = data.parentCid;
next(); next();