From 463c893c3dfe48c8e012a4696bca5375d22c378f Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 27 May 2015 19:08:59 -0400
Subject: [PATCH] fixed regression introduced by #2080, closed #3189

---
 src/categories.js          |  2 +-
 src/controllers/helpers.js | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/categories.js b/src/categories.js
index 134a671744..699b1abc7b 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -244,7 +244,7 @@ var async = require('async'),
 				if (categories[i]) {
 					categories[i]['unread-class'] = (parseInt(categories[i].topic_count, 10) === 0 || (hasRead[i] && uid !== 0)) ? '' : 'unread';
 					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]);
 				}
 			}
diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index 8d4ccb8895..6a35540088 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -57,15 +57,17 @@ helpers.buildCategoryBreadcrumbs = function(cid, callback) {
 	async.whilst(function() {
 		return parseInt(cid, 10);
 	}, function(next) {
-		categories.getCategoryFields(cid, ['name', 'slug', 'parentCid'], function(err, data) {
+		categories.getCategoryFields(cid, ['name', 'slug', 'parentCid', 'disabled'], function(err, data) {
 			if (err) {
 				return next(err);
 			}
 
-			breadcrumbs.unshift({
-				text: validator.escape(data.name),
-				url: nconf.get('relative_path') + '/category/' + data.slug
-			});
+			if (!parseInt(data.disabled, 10)) {
+				breadcrumbs.unshift({
+					text: validator.escape(data.name),
+					url: nconf.get('relative_path') + '/category/' + data.slug
+				});
+			}
 
 			cid = data.parentCid;
 			next();