Skip unnecessary session updates on task switch - switch session task less often (#1490116)

1 files changed, 4 insertions, 4 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 221b50afe..8ea42b600 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -106,14 +106,14 @@ class rcmail extends rcube
         // reset some session parameters when changing task
         if ($this->task != 'utils') {
             // we reset list page when switching to another task
-            // but only to the main task interface - empty action (#1489076)
+            // but only to the main task interface - empty action (#1489076, #1490116)
             // 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;
+                // set current task to session
+                $_SESSION['task'] = $this->task;
+            }
         }
 
         // init output class (not in CLI mode)