summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-08-22 08:52:29 +0200
committerAleksander Machniak <alec@alec.pl>2014-08-22 08:53:17 +0200
commit847f5b9a77e075eea82b5248c06181a5de0e9dde (patch)
treebed81336e0ac85d6ad1470ee891168e295853096
parentdbf70cc7db3c5574f7a89e069591523363db709b (diff)
Fix comm_path update on task switch (#1490041)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcmail.php5
2 files changed, 6 insertions, 0 deletions
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);
}
}