Merge branch 'master' of github.com:designcreateplay/NodeBB

public/src/forum/recent.js

@@ -90,7 +90,7 @@ define(function() {
 
 			$('#category-no-topics').remove();
 
-			html = $(html);
+			html = $(translatedHTML);
 			container.append(html);
 			$('span.timeago').timeago();
 			app.makeNumbersHumanReadable(html.find('.human-readable-number'));

src/posts.js

@@ -388,7 +388,7 @@ var db = require('./database'),
 
 		if(meta.config.imgurClientID) {
 			if(!image || !image.data) {
-				return callback('invalid image', null);
+				return callback(new Error('invalid image'), null);
 			}
 
 			require('./imgur').upload(meta.config.imgurClientID, image.data, 'base64', function(err, data) {

src/routes/user.js

@@ -214,7 +214,7 @@ var fs = require('fs'),
 
 			os.on('error', function (err) {
 				fs.unlinkSync(tempPath);
-				winston.err(err);
+				winston.error(err.message);
 			});
 
 			is.pipe(os);