Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 12:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.1' into hashtalk

Browse Source 
Conflicts:
	src/controllers/topics.js
This commit is contained in:
Julian Lam
2014-09-23 16:16:45 -04:00
parent d7a69e51c1 abdcb32ad2
commit e1211527b0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/topics.js
View File

@@ -91,7 +91,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(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)); page = Math.max(1, Math.ceil(index / settings.postsPerPage));
} }