From ad71ba4fcd52a444452209460e19f63fefc59839 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 9 Nov 2011 13:52:13 +0000
Subject: Backporting r5403 to release branch

---
 program/include/rcube_session.php | 12 ++++++++++++
 program/steps/mail/compose.inc    |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index e8bd9d06c..22aa55016 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -393,6 +393,18 @@ class rcube_session
   }
 
 
+  /**
+   * Re-read session data from storage backend
+   */
+  public function reload()
+  {
+    if ($this->key && $this->memcache)
+      $this->mc_read($this->key);
+    else if ($this->key)
+      $this->db_read($this->key);
+  }
+
+
   /**
    * Serialize session data
    */
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 6961bf86a..c527ce15f 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -31,6 +31,14 @@ $MESSAGE = NULL;
 $COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GET);
 $_SESSION['compose'] = $_SESSION['compose_data_'.$COMPOSE_ID];
 
+// give replicated session storage some time to synchronize
+$retries = 0;
+while ($COMPOSE_ID && !is_array($_SESSION['compose']) && $RCMAIL->db->is_replicated() && $retries++ < 5) {
+  usleep(500000);
+  $RCMAIL->session->reload();
+  $_SESSION['compose'] = $_SESSION['compose_data_'.$COMPOSE_ID];
+}
+
 // Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or
 // if a compose-ID is given (i.e. when the compose step is opened in a new window/tab).
 if (!is_array($_SESSION['compose']))
-- 
cgit v1.2.3