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

public/templates/category.tpl

@@ -42,11 +42,11 @@
 			</div>
 		</li></a>
 		<!-- END topics -->
-		</ul>
 		<hr />
+		</ul>
 		<button id="new_post" class="btn btn-primary btn-large {show_category_features}">New Topic</button>
 	</div>
-	<div class="span3 {show_category_features}">
+	<div class="span3 {show_category_features} category-sidebar">
 		<div class="sidebar-block img-polaroid">
 			<div class="block-header">
 				Recent Replies
@@ -100,7 +100,7 @@
 	]);
 
 	if (jQuery('.category-item').length == 0) {
-		jQuery('.category.row').hide();
+		jQuery('#topics-container, .category-sidebar').hide();
 		jQuery('#category-no-topics').show();
 	}
 

src/topics.js

@@ -338,7 +338,7 @@ marked.setOptions({
 						RDB.lpush(schema.topics(tid).posts, pid);
 
 						// Notify any users looking at the category that a new topic has arrived
-						Topics.get_topics(tid, uid, function(topicData) {
+						Topics.get_topic(tid, uid, function(topicData) {
 							io.sockets.in('category_' + category_id).emit('event:new_topic', topicData);
 						});
 					}