From 5efbfb44755caa532bd653a2418dbb15813ae160 Mon Sep 17 00:00:00 2001 From: alec Date: Fri, 12 Aug 2011 14:01:02 +0000 Subject: - Fix infinite recurrence when saving user preferences stored in session git-svn-id: https://svn.roundcube.net/trunk@5057 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_user.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php index b4a7c8871..d2bbaa176 100644 --- a/roundcubemail/program/include/rcube_user.php +++ b/roundcubemail/program/include/rcube_user.php @@ -122,7 +122,10 @@ class rcube_user if (!empty($_SESSION['preferences'])) { // Check last write attempt time, try to write again (every 5 minutes) if ($_SESSION['preferences_time'] < time() - 5 * 60) { - $this->save_prefs(unserialize($_SESSION['preferences'])); + $saved_prefs = unserialize($_SESSION['preferences']); + $this->rc->session->remove('preferences'); + $this->rc->session->remove('preferences_time'); + $this->save_prefs($saved_prefs); } else { $this->data['preferences'] = $_SESSION['preferences']; -- cgit v1.2.3