Browse Source

Fix so session's search scope is not used if search is not active (#8199)

pull/8503/head
Aleksander Machniak 4 years ago
parent
commit
e62ac0c85d
  1. 1
      CHANGELOG.md
  2. 4
      program/actions/mail/index.php

1
CHANGELOG.md

@ -3,6 +3,7 @@
## Unreleased
- Fix importing contacts with no email address (#8227)
- Fix so session's search scope is not used if search is not active (#8199)
## Release 1.5.0

4
program/actions/mail/index.php

@ -98,8 +98,8 @@ class rcmail_action_mail_index extends rcmail_action
if (empty($rcmail->action)) {
$rcmail->output->set_env('search_mods', self::search_mods());
$scope = rcube_utils::get_input_value('_scope', rcube_utils::INPUT_GET);
if (!$scope && isset($_SESSION['search_scope'])) {
$scope = rcube_utils::get_input_string('_scope', rcube_utils::INPUT_GET);
if (!$scope && isset($_SESSION['search_scope']) && $rcmail->output->get_env('search_request')) {
$scope = $_SESSION['search_scope'];
}

Loading…
Cancel
Save