Merge branch 'development'

Fix ACL Login edit access cuid <-> id lookup
Release: v9.26.5
2025-01-17 14:39:05 +09:00 · 2025-01-17 14:38:41 +09:00 · 2025-01-17 12:52:30 +09:00
2 changed files with 5 additions and 5 deletions
@@ -1 +1 @@
-9.26.4
+9.26.5
@@ -3290,10 +3290,10 @@ HTML;
 	 */
 	public function loginGetEditAccessCuidFromId(int $id): string|false
 	{
-		if (!isset($_SESSION['LOGIN_UNIT_ACL_LEVEL'][$id])) {
+		if (!isset($_SESSION['LOGIN_UNIT_LEGACY'][$id])) {
 			return false;
 		}
-		return (string)$_SESSION['LOGIN_UNIT_ACL_LEVEL'][$id]['cuid'];
+		return (string)$_SESSION['LOGIN_UNIT_LEGACY'][$id]['cuid'];
 	}

 	/**
@@ -3304,10 +3304,10 @@ HTML;
 	 */
 	public function loginGetEditAccessIdFromCuid(string $cuid): int|false
 	{
-		if (!isset($_SESSION['LOGIN_UNIT_LEGACY'][$cuid])) {
+		if (!isset($_SESSION['LOGIN_UNIT'][$cuid])) {
 			return false;
 		}
-		return $_SESSION['LOGIN_UNIT_LEGACY'][$cuid];
+		return $_SESSION['LOGIN_UNIT'][$cuid]['id'];
 	}

 	/**
Author	SHA1	Message	Date
Clemens Schwaighofer	ace02b14d8	Merge branch 'development'	2025-01-17 14:39:05 +09:00
Clemens Schwaighofer	58e916d314	Fix ACL Login edit access cuid <-> id lookup	2025-01-17 14:38:41 +09:00
Clemens Schwaighofer	4f6d85f4da	Release: v9.26.5	2025-01-17 12:52:30 +09:00
@@ -1 +1 @@
 .26.4
 .26.5