diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js
index d1b7a989d0..d9f97ce549 100644
--- a/public/src/modules/helpers.js
+++ b/public/src/modules/helpers.js
@@ -210,7 +210,7 @@
return '' + block.teaser.user['icon:text'] + '
';
}
if (block.user.picture) {
- return '
';
+ return '';
}
return '' + block.user['icon:text'] + '
';
}
diff --git a/src/emailer.js b/src/emailer.js
index d0f859efd7..9c9311d875 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -195,14 +195,14 @@ Emailer.send = function (template, uid, params, callback) {
settings: async.apply(User.getSettings, uid),
}, next);
},
- async function (results, next) {
+ async function (results) {
if (!results.email) {
winston.warn('uid : ' + uid + ' has no email, not sending.');
- return next();
+ return;
}
params.uid = uid;
params.rtl = await translator.translate('[[language:dir]]', results.settings.userLang) === 'rtl';
- Emailer.sendToEmail(template, results.email, results.settings.userLang, params, next);
+ Emailer.sendToEmail(template, results.email, results.settings.userLang, params, function () {});
},
], callback);
};
diff --git a/test/template-helpers.js b/test/template-helpers.js
index f4fad4a128..072d372717 100644
--- a/test/template-helpers.js
+++ b/test/template-helpers.js
@@ -179,28 +179,28 @@ describe('helpers', function () {
it('should render digest avatar', function (done) {
var block = { teaser: { user: { username: 'baris', picture: '/uploads/1.png' } } };
var html = helpers.renderDigestAvatar(block);
- assert.equal(html, '
');
+ assert.equal(html, '');
done();
});
it('should render digest avatar', function (done) {
var block = { teaser: { user: { username: 'baris', 'icon:text': 'B', 'icon:bgColor': '#ff000' } } };
var html = helpers.renderDigestAvatar(block);
- assert.equal(html, '' + block.teaser.user['icon:text'] + '
');
+ assert.equal(html, '' + block.teaser.user['icon:text'] + '
');
done();
});
it('should render digest avatar', function (done) {
var block = { user: { username: 'baris', picture: '/uploads/1.png' } };
var html = helpers.renderDigestAvatar(block);
- assert.equal(html, '');
+ assert.equal(html, '');
done();
});
it('should render digest avatar', function (done) {
var block = { user: { username: 'baris', 'icon:text': 'B', 'icon:bgColor': '#ff000' } };
var html = helpers.renderDigestAvatar(block);
- assert.equal(html, '' + block.user['icon:text'] + '
');
+ assert.equal(html, '' + block.user['icon:text'] + '
');
done();
});