summaryrefslogtreecommitdiff
path: root/program/include/rcmail.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-04-29 09:07:30 +0200
committerAleksander Machniak <alec@alec.pl>2013-04-29 09:08:05 +0200
commitaf98eb046f28e5cf100293dc7b037dc69f7d6333 (patch)
tree9fb74b4ccc10414e9d0b97329bfa1fb4788a3b37 /program/include/rcmail.php
parent8eb66e38c9f2ce2e4af1f7fe9edcbb9071922ff4 (diff)
Fix list page reset when viewing a message in Larry skin (#1489076)
Diffstat (limited to 'program/include/rcmail.php')
-rw-r--r--program/include/rcmail.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 249bd0559..c35c24f8c 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -98,7 +98,10 @@ class rcmail extends rcube
// reset some session parameters when changing task
if ($this->task != 'utils') {
- if ($this->session && $_SESSION['task'] != $this->task)
+ // we reset list page when switching to another task
+ // but only to the main task interface - empty action (#1489076)
+ // this will prevent from unintentional page reset on cross-task requests
+ if ($this->session && $_SESSION['task'] != $this->task && empty($this->action))
$this->session->remove('page');
// set current task to session
$_SESSION['task'] = $this->task;