From a2e7e7078b854b3e45590f252b81af2c1757bdcf Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Mon, 5 Feb 2024 20:15:48 +0100 Subject: [PATCH] #269 removed serialization --- lam/docs/manual-sources/chapter-installation.xml | 8 ++++++++ lam/lib/selfService.inc | 9 ++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lam/docs/manual-sources/chapter-installation.xml b/lam/docs/manual-sources/chapter-installation.xml index 17da0ef58..b75330f70 100644 --- a/lam/docs/manual-sources/chapter-installation.xml +++ b/lam/docs/manual-sources/chapter-installation.xml @@ -608,6 +608,14 @@ version. Unless explicitly noticed there is no need to install an intermediate release. +
+ 8.6 -> 8.7 + + LAM Pro: Self service profiles that were not saved for more than + 3 years must be saved with LAM Pro 8.6 before upgrading to LAM Pro + 8.7. +
+
8.1 -> 8.6 diff --git a/lam/lib/selfService.inc b/lam/lib/selfService.inc index 5164894aa..a146e7534 100644 --- a/lam/lib/selfService.inc +++ b/lam/lib/selfService.inc @@ -6,7 +6,7 @@ use function LAM\PERSISTENCE\dbTableExists; /* This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2006 - 2023 Roland Gruber + Copyright (C) 2006 - 2024 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -476,12 +476,7 @@ class SelfServicePersistenceStrategyFileSystem implements SelfServicePersistence if ($file) { $data = fread($file, 10000000); $profileData = @json_decode($data, true); - if ($profileData === null) { - $profile = unserialize($data); - } - else { - $profile = selfServiceProfile::import($profileData); - } + $profile = selfServiceProfile::import($profileData); fclose($file); } else {