closes #2940

src/controllers/tags.js

@@ -5,6 +5,7 @@ var tagsController = {},
 	nconf = require('nconf'),
 	validator = require('validator'),
 	meta = require('../meta'),
+	user = require('../user'),
 	topics = require('../topics'),
 	helpers =  require('./helpers');
 
@@ -12,21 +13,36 @@ tagsController.getTag = function(req, res, next) {
 	var tag = validator.escape(req.params.tag);
 	var stop = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
 
-	topics.getTagTids(tag, 0, stop, function(err, tids) {
+	async.waterfall([
-		if (err) {
+		function(next) {
-			return next(err);
+			topics.getTagTids(tag, 0, stop, next);
-		}
+		},
-
+		function(tids, next) {
 			if (Array.isArray(tids) && !tids.length) {
 				topics.deleteTag(tag);
-			return res.render('tag', {topics: [], tag: tag});
+				return res.render('tag', {
+					topics: [],
+					tag: tag,
+					breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]', url: '/tags'}, {text: tag}])
+				});
 			}
 
-		topics.getTopics(tids, req.uid, function(err, topics) {
+			async.parallel({
+				isAdmin: async.apply(user.isAdministrator, req.uid),
+				topics: async.apply(topics.getTopics, tids, req.uid)
+			}, next);
+		}
+	], function(err, results) {
 		if (err) {
 			return next(err);
 		}
 
+		if (!results.isAdmin) {
+			results.topics = results.topics.filter(function(topic) {
+				return topic && !topic.deleted;
+			});
+		}
+
 		res.locals.metaTags = [
 			{
 				name: 'title',
@@ -41,15 +57,15 @@ tagsController.getTag = function(req, res, next) {
 				content: nconf.get('url') + '/tags/' + tag
 			}
 		];
+
 		var data = {
-				topics: topics,
+			topics: results.topics,
 			tag: tag,
 			nextStart: stop + 1,
 			breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]', url: '/tags'}, {text: tag}])
 		};
 		res.render('tag', data);
 	});
-	});
 };
 
 tagsController.getTags = function(req, res, next) {