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

)
roundcube · Oct 19, 2021 · a94c2a3 · a94c2a3
1 parent 263003d
commit a94c2a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - Password: Improve handling errors on executed commands (#8200)
 - Fix locked SQLite database for the CLI tools (#8035)
 - 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
 

diff --git a/program/actions/mail/index.php b/program/actions/mail/index.php
@@ -99,7 +99,7 @@ public function run($args = [])
                 $rcmail->output->set_env('search_mods', self::search_mods());
 
                 $scope = rcube_utils::get_input_string('_scope', rcube_utils::INPUT_GET);
-                if (!$scope && isset($_SESSION['search_scope'])) {
+                if (!$scope && isset($_SESSION['search_scope']) && $rcmail->output->get_env('search_request')) {
                     $scope = $_SESSION['search_scope'];
                 }