Fix unintentional messages list page change on page switch in compose addressbook (#1490427)

pull/282/head
Aleksander Machniak 9 years ago
parent e8028083b9
commit 8cab554252

@ -7,6 +7,7 @@ CHANGELOG Roundcube Webmail
- Update to jQuery 2.1.4 (#1490406)
- Fix Compose action in addressbook for results from multiple addressbooks (#1490413)
- Fix bug where some messages in multi-folder search couldn't be opened (#1490426)
- Fix unintentional messages list page change on page switch in compose addressbook (#1490427)
RELEASE 1.1.2
-------------

@ -161,12 +161,17 @@ function rcmail_init_env()
if (!strlen($mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true))) {
$mbox = strlen($_SESSION['mbox']) ? $_SESSION['mbox'] : 'INBOX';
}
if (!($page = intval($_GET['_page']))) {
$page = $_SESSION['page'] ? $_SESSION['page'] : 1;
if ($RCMAIL->action == 'list') {
if (!($page = intval($_GET['_page']))) {
$page = $_SESSION['page'] ? $_SESSION['page'] : 1;
}
$_SESSION['page'] = $page;
}
$RCMAIL->storage->set_folder($_SESSION['mbox'] = $mbox);
$RCMAIL->storage->set_page($_SESSION['page'] = $page);
$RCMAIL->storage->set_page($_SESSION['page']);
// set default sort col/order to session
if (!isset($_SESSION['sort_col'])) {

Loading…
Cancel
Save