summaryrefslogtreecommitdiff
path: root/program/include
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:07:30 +0200
commit7dcf242dd936838f0f1e6c7b46f1cc391e9e34df (patch)
treea86150d3e7dcc0b5423b0c160d0cd4a266c4a979 /program/include
parentd14a2fb8bc11df61d473d4e61822ca70dbea0ee3 (diff)
Fix list page reset when viewing a message in Larry skin (#1489076)
Diffstat (limited to 'program/include')
-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 3f6b39fc7..7acb3490d 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;