dont use titleEscaped if its empty

v1.18.x
barisusakli 9 years ago
parent cb8abab5c5
commit e3077b0ab0

@ -106,7 +106,7 @@ var async = require('async'),
}); });
callback(null, _nids.filter(function(nid, idx) { callback(null, _nids.filter(function(nid, idx) {
return mergeIds.indexOf(sets[idx]) !== -1 return mergeIds.indexOf(sets[idx]) !== -1;
})); }));
}); });
}; };
@ -452,11 +452,12 @@ var async = require('async'),
var title = S(notifications[modifyIndex].topicTitle || '').decodeHTMLEntities().s; var title = S(notifications[modifyIndex].topicTitle || '').decodeHTMLEntities().s;
var titleEscaped = title.replace(/%/g, '%').replace(/,/g, ','); var titleEscaped = title.replace(/%/g, '%').replace(/,/g, ',');
titleEscaped = titleEscaped ? (', ' + titleEscaped) : '';
if (numUsers === 2) { if (numUsers === 2) {
notifications[modifyIndex].bodyShort = '[[' + mergeId + '_dual, ' + usernames.join(', ') + ', ' + titleEscaped + ']]'; notifications[modifyIndex].bodyShort = '[[' + mergeId + '_dual, ' + usernames.join(', ') + titleEscaped + ']]';
} else if (numUsers > 2) { } else if (numUsers > 2) {
notifications[modifyIndex].bodyShort = '[[' + mergeId + '_multiple, ' + usernames[0] + ', ' + (numUsers-1) + ', ' + titleEscaped + ']]'; notifications[modifyIndex].bodyShort = '[[' + mergeId + '_multiple, ' + usernames[0] + ', ' + (numUsers - 1) + titleEscaped + ']]';
} }
break; break;

Loading…
Cancel
Save