From 284af0ded110b6ba0a82cf470dd2ffc99e198efc Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 20 Apr 2022 11:02:29 +0800
Subject: [PATCH]  * Fix bug #21632.

---
 module/common/model.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 7ca52cefe4..96faa52174 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2245,9 +2245,17 @@ EOD;
             }
             else
             {
-                if(helper::isAjaxRequest()) die(json_encode(array('result' => false, 'message' => $this->lang->error->loginTimeout))); // Fix bug #14478.
+                $uri = $this->app->getURI(true);
+                if($module == 'message' and $method == 'ajaxgetmessage')
+                {
+                    $uri = helper::createLink('my');
+                }
+                elseif(helper::isAjaxRequest())
+                {
+                    die(json_encode(array('result' => false, 'message' => $this->lang->error->loginTimeout))); // Fix bug #14478.
+                }
 
-                $referer  = helper::safe64Encode($this->app->getURI(true));
+                $referer = helper::safe64Encode($uri);
                 print(js::locate(helper::createLink('user', 'login', "referer=$referer")));
                 helper::end();
             }