diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-09-11 19:34:35 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-09-11 19:36:32 +0200 |
| commit | 8361a48bdd2c365a82ed67ce652a83663149713c (patch) | |
| tree | 4c2d9c1540c8f4cf6bea7d4968f1303d46bd4f99 /program/steps/settings/save_folder.inc | |
| parent | 1424e53b96e79ad212b67d74eb5d372c14e8b1b3 (diff) | |
Fix error where session wasn't updated after folder rename/delete (#1488692)
Conflicts:
CHANGELOG
Diffstat (limited to 'program/steps/settings/save_folder.inc')
| -rw-r--r-- | program/steps/settings/save_folder.inc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc index f3692de30..84a4a44eb 100644 --- a/program/steps/settings/save_folder.inc +++ b/program/steps/settings/save_folder.inc @@ -1,11 +1,11 @@ <?php -/* +/** +-----------------------------------------------------------------------+ | program/steps/settings/save_folder.inc | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2009, The Roundcube Dev Team | + | Copyright (C) 2005-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -173,7 +173,7 @@ else if (!$error) { } else if (preg_match($oldprefix, $key)) { unset($a_threaded[$key]); - $a_threaded[preg_replace($oldprefix, $folder['name'].$delimiter, $key)] = true; + $a_threaded[preg_replace($oldprefix, $folder['name'].$delimiter, $key)] = true; } } } @@ -186,7 +186,12 @@ else if (!$error) { } $OUTPUT->show_message('folderupdated', 'confirmation'); + if ($rename) { + // #1488692: update session + if ($_SESSION['mbox'] === $folder['oldname']) { + $_SESSION['mbox'] = $folder['name']; + } rcmail_update_folder_row($folder['name'], $folder['oldname'], $folder['subscribe'], $folder['class']); $OUTPUT->send('iframe'); } |