From fe0dbe7fb7366b71d05e4f3b5b0ae5e42be8ee6a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 12 Jan 2018 16:31:48 +0100
Subject: [PATCH] Fix type in CryptoSessionData
Found while adding strict typing for PHP7+.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
lib/private/Session/CryptoSessionData.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/private/Session/CryptoSessionData.php b/lib/private/Session/CryptoSessionData.php
index 272e82ef496..530bd9063c3 100644
--- a/lib/private/Session/CryptoSessionData.php
+++ b/lib/private/Session/CryptoSessionData.php
@@ -75,7 +75,7 @@ class CryptoSessionData implements \ArrayAccess, ISession {
}
protected function initializeSession() {
- $encryptedSessionData = $this->session->get(self::encryptedSessionName);
+ $encryptedSessionData = $this->session->get(self::encryptedSessionName) ?: '';
try {
$this->sessionValues = json_decode(
$this->crypto->decrypt($encryptedSessionData, $this->passphrase),
--
GitLab