Merge remote-tracking branch 'origin/master' into 0.7.0

This commit is contained in:
barisusakli
2015-01-29 12:53:01 -05:00
10 changed files with 108 additions and 46 deletions

View File

@@ -34,8 +34,6 @@ define('forum/topic/posts', [
var posts = data.posts;
socket.emit('topics.getPageCount', ajaxify.variables.get('topic_id'), function(err, newPageCount) {
pagination.recreatePaginationLinks(newPageCount);
if (pagination.currentPage === pagination.pageCount) {
createNewPosts(data);
} else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) {