Merge branch '0.5.1' into hashtalk

Conflicts:
	src/controllers/topics.js
v1.18.x
Julian Lam 11 years ago
commit e1211527b0

@ -91,7 +91,7 @@ topicsController.get = function(req, res, next) {
postIndex = Math.max((req.params.post_index || 1) - (settings.postsPerPage + 1), 0);
}
} else if (!req.query.page) {
var index = Math.max(req.params.post_index - 1, 0);
var index = Math.max(req.params.post_index - 1, 0) || 0;
page = Math.max(1, Math.ceil(index / settings.postsPerPage));
}

Loading…
Cancel
Save