Merge pull request #7824 from nextcloud/fix-type-in-CryptoSessionData

MorrisJobke · web-flow · commit 16f4d71efd25 · 2018-01-13T00:01:52.000+01:00
Fix type in CryptoSessionData
diff --git a/lib/private/Session/CryptoSessionData.php b/lib/private/Session/CryptoSessionData.php
@@ -75,7 +75,7 @@ public function __destruct() {
 	}
 
 	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),

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function __destruct() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`protected function initializeSession() {`
`78`		`- $encryptedSessionData = $this->session->get(self::encryptedSessionName);`
	`78`	`+ $encryptedSessionData = $this->session->get(self::encryptedSessionName) ?: '';`
`79`	`79`	`try {`
`80`	`80`	`$this->sessionValues = json_decode(`
`81`	`81`	`$this->crypto->decrypt($encryptedSessionData, $this->passphrase),`