summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-13 00:01:52 +0100
committerGitHub <noreply@github.com>2018-01-13 00:01:52 +0100
commit16f4d71efd257e66550d61013e39ecf96c10fa0f (patch)
tree9cb0b5df1cc9aba1b12983b9129ed76a897efb42
parent3dc7d0fb900eec8b792768505299ba73300efb89 (diff)
parentfe0dbe7fb7366b71d05e4f3b5b0ae5e42be8ee6a (diff)
downloadnextcloud-server-16f4d71efd257e66550d61013e39ecf96c10fa0f.tar.gz
nextcloud-server-16f4d71efd257e66550d61013e39ecf96c10fa0f.zip
Merge pull request #7824 from nextcloud/fix-type-in-CryptoSessionData
Fix type in CryptoSessionData
-rw-r--r--lib/private/Session/CryptoSessionData.php2
1 files changed, 1 insertions, 1 deletions
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),