From 847f5b9a77e075eea82b5248c06181a5de0e9dde Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 22 Aug 2014 08:52:29 +0200
Subject: Fix comm_path update on task switch (#1490041)

---
 CHANGELOG                  | 1 +
 program/include/rcmail.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 6da59a53e..3a8b48e71 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ CHANGELOG Roundcube Webmail
 - Fix incorrect thumbnail rotation with GD and exif orientation data (#1490029)
 - Fix contacts list update after adding/deleting/moving a contact (#1490028, #1490033)
 - Fix handling of email addresses with quoted domain part (#1490040)
+- Fix comm_path update on task switch (#1490041)
 
 RELEASE 1.0.2
 -------------
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 04be841d7..1da2f8f91 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -145,8 +145,13 @@ class rcmail extends rcube
         $this->task      = $task;
         $this->comm_path = $this->url(array('task' => $this->task));
 
+        if (!empty($_REQUEST['_framed'])) {
+            $this->comm_path .= '&_framed=1';
+        }
+
         if ($this->output) {
             $this->output->set_env('task', $this->task);
+            $this->output->set_env('comm_path', $this->comm_path);
         }
     }
 
-- 
cgit v1.2.3