From c5522146da19ecaa22884be7572d67bbf0dbb9dd Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 12 Aug 2022 13:12:56 +0800
Subject: [PATCH 1/3] * Fix bug #26325.

---
 module/user/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/user/model.php b/module/user/model.php
index 4e366ef854..83fe7a3f4a 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -798,6 +798,7 @@ class userModel extends model
         $this->dao->update(TABLE_USER)->data($user)->autoCheck()->where('id')->eq((int)$userID)->exec();
         $this->app->user->password       = $user->password;
         $this->app->user->modifyPassword = false;
+        $_SESSION['user']->password = $user->password;
         if(!dao::isError())
         {
             if(!empty($this->app->user->modifyPasswordReason)) $this->app->user->modifyPasswordReason = '';

From 698510fadfa88681f9d3d56e0b60458721263ef7 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 12 Aug 2022 13:13:38 +0800
Subject: [PATCH 2/3] * Fix bug #26325.

---
 module/user/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/user/model.php b/module/user/model.php
index 83fe7a3f4a..7fec646510 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -796,9 +796,9 @@ class userModel extends model
         }
 
         $this->dao->update(TABLE_USER)->data($user)->autoCheck()->where('id')->eq((int)$userID)->exec();
+        $_SESSION['user']->password      = $user->password;
         $this->app->user->password       = $user->password;
         $this->app->user->modifyPassword = false;
-        $_SESSION['user']->password = $user->password;
         if(!dao::isError())
         {
             if(!empty($this->app->user->modifyPasswordReason)) $this->app->user->modifyPasswordReason = '';

From f540e5838851be00718416fc1be3af4f92c7b919 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 12 Aug 2022 14:25:29 +0800
Subject: [PATCH 3/3] * Fix bug.

---
 module/execution/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 5c441b0f47..14d8e21126 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -100,7 +100,7 @@ class executionModel extends model
             include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
         }
 
-        if(isset($execution->cal) and $execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist);
+        if(isset($execution->acl) and $execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist);
 
         if($execution and $execution->lifetime == 'ops')
         {