Merge branch 'sprint/tianshujie_bug24686' into 'master'

* Fix bug #24686. See merge request easycorp/zentaopms!4312
2022-07-04 07:03:49 +00:00
parent 04b2a5994f 8c173c0770
commit 0f932b4c64
1 changed files with 1 additions and 1 deletions
@@ -969,7 +969,7 @@ class user extends control
        }
        else
        {
-            $loginExpired = !(preg_match("/(m=|\/)(index)(&f=|-)(index)(&|-|\.)?/", strtolower($this->referer), $output) or $this->referer == '/' or $this->referer == '/zentao/' or empty($this->referer));
+            $loginExpired = !(preg_match("/(m=|\/)(index)(&f=|-)(index)(&|-|\.)?/", strtolower($this->referer), $output) or $this->referer == $this->config->webRoot or empty($this->referer));

            $this->loadModel('misc');
            $this->loadModel('extension');