diff --git a/public/src/forum/category.js b/public/src/forum/category.js index f8306f6063..380db05f18 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -56,8 +56,6 @@ container.insertBefore(topic, null); $(topic).hide().fadeIn('slow'); } - - ajaxify.enable(); }); diff --git a/src/install.js b/src/install.js index 24709cb5ab..de7cb1e164 100644 --- a/src/install.js +++ b/src/install.js @@ -11,8 +11,7 @@ var async = require('async'), 'redis:host|Host IP or address of your Redis instance? (127.0.0.1)', 'redis:port|Host port of your Redis instance? (6379)', 'redis:password|Password of your Redis database? (no password)', - 'secret|Your NodeBB secret? (keyboard mash for a bit here)', - 'bcrypt_rounds|The number of rounds to use for bcrypt.genSalt? (10)' + 'secret|Your NodeBB secret? (keyboard mash for a bit here)' ], defaults: { "base_url": 'http://localhost', @@ -22,7 +21,7 @@ var async = require('async'), "redis:port": 6379, "redis:password": '', "secret": utils.generateUUID(), - "bcrypt_rounds": 10, + "bcrypt_rounds": 12, "upload_path": '/public/uploads' }, ask: function(question, callback) { diff --git a/src/topics.js b/src/topics.js index a616df8bb3..1fb7ec7e97 100644 --- a/src/topics.js +++ b/src/topics.js @@ -173,7 +173,8 @@ marked.setOptions({ topicData.teaser_text = teaser.text || ''; topicData.teaser_username = teaser.username || ''; topicData.teaser_timestamp = teaser.timestamp ? utils.relativeTime(teaser.timestamp) : ''; - + topicData.teaser_userpicture = teaser.picture; + callback(topicData); }); }