TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-24 06:35:49 +03:00
Code Issues Projects Releases Wiki Activity

lint fixes & bcrypt-nodejs

Browse Source
This commit is contained in:
Tim Griesser 2013-05-29 21:58:59 -04:00
parent cf9c2462fa
commit 7cbbb3af4e
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/shared/models/base.js
View File

@ -2,9 +2,7 @@
"use strict";
var _ = require('underscore'),
GhostBookshelf,
BookshelfBase,
var GhostBookshelf,
Bookshelf = require('bookshelf'),
config = require('../../../config');

3
core/shared/models/setting.js
View File

@ -5,8 +5,7 @@
Settings,
GhostBookshelf = require('./base'),
_ = require('underscore'),
when = require('when'),
SettingsProvider;
when = require('when');
Setting = GhostBookshelf.Model.extend({

4
core/shared/models/user.js
View File

@ -6,7 +6,7 @@
_ = require('underscore'),
when = require('when'),
nodefn = require('when/node/function'),
bcrypt = require('bcrypt'),
bcrypt = require('bcrypt-nodejs'),
Posts = require('./post').Posts,
GhostBookshelf = require('./base');
@ -33,7 +33,7 @@
// Clone the _user so we don't expose the hashed password unnecessarily
userData = _.extend({}, _user);
return nodefn.call(bcrypt.hash, _user.password, 10).then(function (hash) {
return nodefn.call(bcrypt.hash, _user.password, null, null).then(function (hash) {
userData.password = hash;
return GhostBookshelf.Model.add.call(User, userData);
});