From ea91c102007882bbd252f51d745ed89fd5a55b1b Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Fri, 22 Apr 2022 17:11:12 +0800 Subject: [PATCH 1/2] * fix loop redirect in safari. --- module/common/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index 5aaa48b24c..75033f50cd 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2286,7 +2286,7 @@ EOD; { if($_SERVER['HTTP_SEC_FETCH_DEST'] == 'iframe') return; } - else if(isset($_SERVER['HTTP_REFERER']) && !empty($_SERVER['HTTP_REFERER'])) + else if(strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') !== false || (isset($_SERVER['HTTP_REFERER']) && !empty($_SERVER['HTTP_REFERER']))) { return; } From abb3d4cf840ed8d2c5ef7239803b8ded0425ada7 Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Fri, 22 Apr 2022 17:12:20 +0800 Subject: [PATCH 2/2] * refactor. --- module/common/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index 75033f50cd..04d72c0aca 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2286,7 +2286,7 @@ EOD; { if($_SERVER['HTTP_SEC_FETCH_DEST'] == 'iframe') return; } - else if(strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') !== false || (isset($_SERVER['HTTP_REFERER']) && !empty($_SERVER['HTTP_REFERER']))) + else if((isset($_SERVER['HTTP_REFERER']) && !empty($_SERVER['HTTP_REFERER'])) || strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') !== false) { return; }