fixed conflict

v1.18.x
Baris Soner Usakli 11 years ago
commit f5741fd48b

@ -10,8 +10,8 @@ define(['forum/accountheader'], function(header) {
showemail: $('#showemailCheckBox').is(':checked') ? 1 : 0 showemail: $('#showemailCheckBox').is(':checked') ? 1 : 0
}; };
socket.emit('api:user.saveSettings', settings, function(success) { socket.emit('api:user.saveSettings', settings, function(err) {
if (success) { if (!err) {
app.alertSuccess('Settings saved!'); app.alertSuccess('Settings saved!');
} else { } else {
app.alertError('There was an error saving settings!'); app.alertError('There was an error saving settings!');

Loading…
Cancel
Save