mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-01 19:46:01 +01:00
hopefully final fix
This commit is contained in:
@@ -15,7 +15,7 @@ var topicsController = {},
|
|||||||
|
|
||||||
topicsController.get = function(req, res, next) {
|
topicsController.get = function(req, res, next) {
|
||||||
var tid = req.params.topic_id,
|
var tid = req.params.topic_id,
|
||||||
page = req.query.page || 1,
|
page = 1,
|
||||||
sort = req.query.sort,
|
sort = req.query.sort,
|
||||||
uid = req.user ? req.user.uid : 0,
|
uid = req.user ? req.user.uid : 0,
|
||||||
userPrivileges;
|
userPrivileges;
|
||||||
@@ -62,10 +62,11 @@ topicsController.get = function(req, res, next) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var postIndex = 0;
|
var postIndex = 0;
|
||||||
|
page = parseInt(req.query.page, 10) || 1;
|
||||||
req.params.post_index = parseInt(req.params.post_index, 10) || 0;
|
req.params.post_index = parseInt(req.params.post_index, 10) || 0;
|
||||||
if (!settings.usePagination) {
|
if (!settings.usePagination) {
|
||||||
if (reverse) {
|
if (reverse) {
|
||||||
if (parseInt(req.params.post_index, 10) === 1) {
|
if (req.params.post_index === 1) {
|
||||||
req.params.post_index = 0;
|
req.params.post_index = 0;
|
||||||
}
|
}
|
||||||
postIndex = Math.max(postCount - (req.params.post_index || postCount) - (settings.postsPerPage - 1), 0);
|
postIndex = Math.max(postCount - (req.params.post_index || postCount) - (settings.postsPerPage - 1), 0);
|
||||||
@@ -73,7 +74,7 @@ topicsController.get = function(req, res, next) {
|
|||||||
postIndex = Math.max((req.params.post_index || 1) - (settings.postsPerPage + 1), 0);
|
postIndex = Math.max((req.params.post_index || 1) - (settings.postsPerPage + 1), 0);
|
||||||
}
|
}
|
||||||
} else if (!req.query.page) {
|
} else if (!req.query.page) {
|
||||||
var index = Math.max(parseInt(req.params.post_index, 10), 0);
|
var index = Math.max(req.params.post_index, 0);
|
||||||
page = Math.ceil((index + 1) / settings.postsPerPage);
|
page = Math.ceil((index + 1) / settings.postsPerPage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user