From e35eab5f946fbdca688040da61d33a1a4153f968 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 22 Aug 2014 02:52:29 -0400
Subject: [PATCH] Fix comm_path update on task switch (#1490041)
---
CHANGELOG | 1 +
program/include/rcmail.php | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index d6606eb..f2dcade 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,6 +57,7 @@
- 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 bb2346f..0c41c15 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -147,8 +147,13 @@
$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);
}
}
--
Gitblit v1.9.1