Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'liyuchun_fixbug_21632' into 'master'

Browse Source 
* Fix bug #21632.

See merge request easycorp/zentaopms!3024
This commit is contained in:
孙广明
2022-04-21 01:22:29 +00:00
parent 5f18c15827 816c36770d
commit ac0eb8c657
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+10 -2
View File
@@ -2251,9 +2251,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();
}