Fix characters encoding in group rename input after group creation/rename (#7330)

pull/7342/head
Aleksander Machniak 5 years ago
parent 3e9aefceef
commit cb9b22dcc1

@ -36,6 +36,7 @@ CHANGELOG Roundcube Webmail
- Fix so imap error message is displayed to the user on folder create/update (#7245)
- Fix bug where a special folder couldn't be created if a special-use flag is not supported (#7147)
- Mailvelope: Fix bug where recipients with name were not handled properly in mail compose (#7312)
- Fix characters encoding in group rename input after group creation/rename (#7330)
RELEASE 1.4.3
-------------

@ -6760,7 +6760,7 @@ function rcube_webmail()
var key = 'G'+prop.source+prop.id,
link = $('<a>').attr({href: '#', rel: prop.source + ':' + prop.id})
.click(function() { return ref.command('listgroup', prop, this); })
.html(prop.name);
.text(prop.name);
this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
this.treelist.insert({ id:key, html:link, classes:['contactgroup'] }, prop.source, 'contactgroup');
@ -6796,11 +6796,11 @@ function rcube_webmail()
newnode.id = newkey;
newnode.html = $('<a>').attr({href: '#', rel: prop.source + ':' + prop.newid})
.click(function() { return ref.command('listgroup', newprop, this); })
.html(prop.name);
.text(prop.name);
}
// update displayed group name
else {
$(this.treelist.get_item(key)).children().first().html(prop.name);
$(this.treelist.get_item(key)).children().first().text(prop.name);
this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
if (prop.source == this.env.source && prop.id == this.env.group)

@ -92,8 +92,6 @@ else if ($RCMAIL->action == 'group-create') {
}
if ($created && $OUTPUT->ajax_call) {
$created['name'] = rcube::Q($created['name']);
$OUTPUT->show_message('groupcreated', 'confirmation');
$OUTPUT->command('insert_contact_group', array('source' => $source) + $created);
}
@ -120,7 +118,7 @@ else if ($RCMAIL->action == 'group-rename') {
if ($newname && $OUTPUT->ajax_call) {
$OUTPUT->show_message('grouprenamed', 'confirmation');
$OUTPUT->command('update_contact_group', array(
'source' => $source, 'id' => $gid, 'name' => rcube::Q($newname), 'newid' => $newgid));
'source' => $source, 'id' => $gid, 'name' => $newname, 'newid' => $newgid));
}
else if (!$newname) {
$OUTPUT->show_message($plugin['message'] ?: 'errorsaving', 'error');

Loading…
Cancel
Save