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

This commit is contained in:
Julian Lam
2014-02-01 14:59:51 -05:00
2 changed files with 3 additions and 2 deletions

View File

@@ -4,6 +4,7 @@
<li class="active">[[unread:title]]</li>
</ol>
<div class="alert alert-warning {no_topics_message}" id="category-no-topics">
<strong>[[unread:no_unread_topics]]</strong>
</div>

View File

@@ -598,7 +598,7 @@ var async = require('async'),
};
function noUnreadTopics() {
unreadTopics.no_topics_message = 'show';
unreadTopics.no_topics_message = '';
unreadTopics.show_markallread_button = 'hidden';
callback(null, unreadTopics);
}
@@ -619,7 +619,7 @@ var async = require('async'),
unreadTopics.nextStart = parseInt(rank, 10) + 1;
if (!topicData || topicData.length === 0) {
unreadTopics.no_topics_message = 'show';
unreadTopics.no_topics_message = '';
}
if (uid === 0 || topicData.length === 0) {
unreadTopics.show_markallread_button = 'hidden';