From 8361a48bdd2c365a82ed67ce652a83663149713c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 11 Sep 2012 13:36:32 -0400
Subject: [PATCH] Fix error where session wasn't updated after folder rename/delete (#1488692)
---
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 f3692de..84a4a44 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 (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 @@
}
$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');
}
--
Gitblit v1.9.1