From 7dcf242dd936838f0f1e6c7b46f1cc391e9e34df Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 29 Apr 2013 03:07:30 -0400
Subject: [PATCH] Fix list page reset when viewing a message in Larry skin (#1489076)
---
CHANGELOG | 1 +
program/include/rcmail.php | 5 ++++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index dcca85c..12b1f32 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix list page reset when viewing a message in Larry skin (#1489076)
- Fix min_refresh_interval handling on preferences save (#1489073)
- Fix PDF support detection for Firefox PDF.js (#1488972)
- Fix messages list focus issue in Internet Explorer (#1489058)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 3f6b39f..7acb349 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -98,7 +98,10 @@
// 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;
--
Gitblit v1.9.1