From 7cc557e5283c0761eecd9c5ad2e65cac23f43bda Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Fri, 22 Apr 2022 09:01:32 +0800
Subject: [PATCH 1/3]  * Fix bug #7008.

---
 module/common/view/footer.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php
index 95e4a8db38..84ebd0b205 100755
--- a/module/common/view/footer.html.php
+++ b/module/common/view/footer.html.php
@@ -16,11 +16,12 @@ needPing = false;
 $(function()
 {
     var windowBlur = false;
-    if(window.Notification)
+    if(window.Notification && Notification.permission == 'granted')
     {
         window.onblur  = function(){windowBlur = true;}
         window.onfocus = function(){windowBlur = false;}
     }
+
     setInterval(function()
     {
         $.get(createLink('message', 'ajaxGetMessage', "windowBlur=" + (windowBlur ? '1' : '0')), function(data)

From e8abf792f7f5546615ac7db026efefa32c3104f7 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Fri, 22 Apr 2022 11:21:32 +0800
Subject: [PATCH 2/3]  * Fix bug #11939.

---
 framework/base/helper.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index ac1dcb7f2e..3a645afe62 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -691,7 +691,7 @@ class baseHelper
      * @access public
      * @return string
      */
-    public static function getRemoteIp($proxy = false)
+    public static function getRemoteIp($proxy = true)
     {
         $ip = '';
         if(!empty($_SERVER["REMOTE_ADDR"])) $ip = $_SERVER["REMOTE_ADDR"];

From d9f452dc50e99e4e5d125370a80cc6dbb68b3802 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Fri, 22 Apr 2022 12:49:40 +0800
Subject: [PATCH 3/3]  * Fix bug #21629.

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

diff --git a/module/mr/model.php b/module/mr/model.php
index 712740bb74..b60a9a3566 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -1392,6 +1392,7 @@ class mrModel extends model
             ->where('t1.AType')->eq('mr')
             ->andWhere('t1.BType')->eq($objectType)
             ->andWhere('t1.BID')->eq($objectID)
+            ->andWhere('t2.id')->ne(0)
             ->fetchPairs();
     }