From 1f0732ae256f1994ec967dfc894ec3aa4edc8a5d Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Mon, 1 Aug 2022 09:58:07 +0200 Subject: [PATCH] Version-Plugin: Session-Variable korrigiert (#5276) --- .../addons/structure/plugins/version/lib/revision.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/redaxo/src/addons/structure/plugins/version/lib/revision.php b/redaxo/src/addons/structure/plugins/version/lib/revision.php index b2e4a2fcb0..6560e41948 100644 --- a/redaxo/src/addons/structure/plugins/version/lib/revision.php +++ b/redaxo/src/addons/structure/plugins/version/lib/revision.php @@ -76,8 +76,9 @@ public static function clearContent($articleId, $clang, $fromRevisionId) public static function setSessionArticleRevision(int $articleId, int $revision): void { $login = rex::getProperty('login'); - /** @var array $revisions */ - $revisions = $login->getSessionVar('rex_version_article'); + /** @var array|null $revisions */ + $revisions = $login->getSessionVar('rex_version_article', []); + $revisions = is_array($revisions) ? $revisions : []; $revisions[$articleId] = $revision; $login->setSessionVar('rex_version_article', $revisions); @@ -86,8 +87,8 @@ public static function setSessionArticleRevision(int $articleId, int $revision): public static function getSessionArticleRevision(int $articleId): int { /** @var array $revisions */ - $revisions = rex::getProperty('login')->getSessionVar('rex_version_article'); + $revisions = rex::getProperty('login')->getSessionVar('rex_version_article', []); - return $revisions[$articleId] ?? 1; + return (int) ($revisions[$articleId] ?? 1); } }