summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/js/app.js2
-rw-r--r--program/steps/settings/manage_folders.inc3
2 files changed, 4 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 222a7db84..cba5313af 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2535,6 +2535,8 @@ function rcube_webmail()
var form;
if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
name = form.elements['_folder_name'].value;
+ if (this.env.folder)
+ name = this.env.folder+this.env.delimiter+name;
if (name)
this.http_post('create-folder', '_name='+urlencode(name), true);
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index b39cef612..d960a1e13 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -53,7 +53,8 @@ else if ($_action=='create-folder')
if ($create && $OUTPUT->ajax_call)
{
- $OUTPUT->command('add_folder_row', $create, rcube_charset_convert($create, 'UTF-7'));
+ $display_create = str_repeat('    ', substr_count($create, $IMAP->delimiter)) . preg_replace('/.*' . preg_quote($IMAP->delimiter) . '/', '', rcube_charset_convert($create, 'UTF-7'));
+ $OUTPUT->command('add_folder_row', $create, $display_create);
$OUTPUT->send();
}
else if (!$create && $OUTPUT->ajax_call)