From e8cb51669a325a3d5b60fcc37b99d494809bf837 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 7 Apr 2014 16:24:37 +0200
Subject: More fixes for multi-folder search (#1485234)

---
 program/lib/Roundcube/rcube_message.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'program/lib/Roundcube/rcube_message.php')

diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index f24ec3ed8..ad94005ac 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -74,6 +74,11 @@ class rcube_message
      */
     function __construct($uid, $folder = null)
     {
+        // decode combined UID-folder identifier
+        if (preg_match('/^\d+-[^,]+$/', $uid)) {
+            list($uid, $folder) = explode('-', $uid);
+        }
+
         $this->uid  = $uid;
         $this->app  = rcube::get_instance();
         $this->storage = $this->app->get_storage();
-- 
cgit v1.2.3