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

fixed #1189

Browse Source
This commit is contained in:
Julian Lam
2014-03-10 15:31:47 -04:00
parent 65b49d5de8
commit a7f310b49a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/user.js
View File

@@ -201,7 +201,7 @@ var bcrypt = require('bcryptjs'),
function sendDefaultSettings() { function sendDefaultSettings() {
callback(null, { callback(null, {
showemail: false, showemail: false,
usePagination: parseInt(meta.config.usePagination, 10) !== 0, usePagination: parseInt(meta.config.usePagination, 10) === 1,
topicsPerPage: parseInt(meta.config.topicsPerPage, 10) || 20, topicsPerPage: parseInt(meta.config.topicsPerPage, 10) || 20,
postsPerPage: parseInt(meta.config.postsPerPage, 10) || 10 postsPerPage: parseInt(meta.config.postsPerPage, 10) || 10
}); });
@@ -221,7 +221,7 @@ var bcrypt = require('bcryptjs'),
} }
settings.showemail = settings.showemail ? parseInt(settings.showemail, 10) !== 0 : false; settings.showemail = settings.showemail ? parseInt(settings.showemail, 10) !== 0 : false;
settings.usePagination = settings.usePagination ? parseInt(settings.usePagination, 10) !== 0 : parseInt(meta.config.usePagination, 10) !== 0; settings.usePagination = settings.usePagination ? parseInt(settings.usePagination, 10) === 1 : parseInt(meta.config.usePagination, 10) === 1;
settings.topicsPerPage = settings.topicsPerPage ? parseInt(settings.topicsPerPage, 10) : parseInt(meta.config.topicsPerPage, 10) || 20; settings.topicsPerPage = settings.topicsPerPage ? parseInt(settings.topicsPerPage, 10) : parseInt(meta.config.topicsPerPage, 10) || 20;
settings.postsPerPage = settings.postsPerPage ? parseInt(settings.postsPerPage, 10) : parseInt(meta.config.postsPerPage, 10) || 10; settings.postsPerPage = settings.postsPerPage ? parseInt(settings.postsPerPage, 10) : parseInt(meta.config.postsPerPage, 10) || 10;