From 68896196ea6c6a9b98b7c0d2033d9dccb8467c55 Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Sat, 29 Jul 2023 23:53:04 +0800
Subject: [PATCH] loggedinorreturn use nexus_redirect()

---
 include/constants.php | 2 +-
 include/functions.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/constants.php b/include/constants.php
index 5aa5bc87a..6f04ffb18 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,5 +1,5 @@
 <?php
-defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.5');
+defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.6');
 defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-07-29');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
diff --git a/include/functions.php b/include/functions.php
index b2c626b1b..885920188 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3100,12 +3100,12 @@ function loggedinorreturn($mainpage = false) {
 	    if (nexus()->getScript() == 'ajax') {
 	        exit(fail('Not login!', $_POST));
         }
-		if ($mainpage)
-		header("Location: " . get_protocol_prefix() . "$BASEURL/login.php");
-		else {
+		if ($mainpage) {
+            nexus_redirect("login.php");
+        } else {
 			$to = $_SERVER["REQUEST_URI"];
 			$to = basename($to);
-			header("Location: " . get_protocol_prefix() . "$BASEURL/login.php?returnto=" . rawurlencode($to));
+            nexus_redirect("login.php?returnto=" . rawurlencode($to));
 		}
 		exit();
 	}