From 80373a5cad163005f756023a8905e76d56d32384 Mon Sep 17 00:00:00 2001
From: Licoy <licoycn@gmail.com>
Date: Sun, 13 Nov 2022 19:30:29 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/ajax/page-front-login.php | 2 +-
 inc/fun/core.php              | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/inc/ajax/page-front-login.php b/inc/ajax/page-front-login.php
index dc2bed56..3906deae 100644
--- a/inc/ajax/page-front-login.php
+++ b/inc/ajax/page-front-login.php
@@ -151,7 +151,7 @@ function pk_front_forget_password_reset_exec()
 function pk_front_login_page_callback()
 {
     $redirect = $_GET['redirect'] ?? get_edit_profile_url();
-    $forget_password_url = pk_ajax_url('pk_font_login_page', ['redirect' => $_SERVER['REQUEST_URI']]);
+    $forget_password_url = pk_ajax_url('pk_font_login_page', ['redirect' => $redirect]);
     $open_register = get_option('users_can_register') == 1;
     ?>
 
diff --git a/inc/fun/core.php b/inc/fun/core.php
index 4ebab814..6184a01a 100755
--- a/inc/fun/core.php
+++ b/inc/fun/core.php
@@ -601,6 +601,7 @@ function get_all_category_id_row($type = null)
 //获取菜单数据
 function pk_get_main_menu($mobile = false)
 {
+    global $wp;
     $menus = get_nav_menu_object('primary');
     $out = $mobile ? "<ul class='puock-links t-md'>" : "<ul>";
     if ($menus && count($menus) > 0) {
@@ -612,7 +613,7 @@ function pk_get_main_menu($mobile = false)
         $out .= '<li><a data-no-instant data-toggle="tooltip" title="用户中心" href="' . get_edit_profile_url() . '"><img alt="用户中心" src="' . $avatar . '" class="min-avatar"></a></li>';
     } else {
         if (pk_is_checked('show_login_url')) {
-            $url = pk_ajax_url('pk_font_login_page', ['redirect' => $_SERVER['REQUEST_URI']]);
+            $url = pk_ajax_url('pk_font_login_page', ['redirect' => home_url( $wp->request )]);
             $out .= '<li><a data-no-instant data-toggle="tooltip" title="登入" data-title="登入" href="javascript:void(0)" class="pk-modal-toggle" data-id="front-login" data-url="' . $url . '"><i class="fa fa-right-to-bracket"></i></a></li>';
         }
     }