Version-Plugin: Session-Variable korrigiert (#5276)

redaxo · Aug 1, 2022 · 1f0732a · 1f0732a
1 parent 432bd27
commit 1f0732a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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<int, 0|1> $revisions */
-        $revisions = $login->getSessionVar('rex_version_article');
+        /** @var array<int, 0|1>|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<int, 0|1> $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);
     }
 }