From c2152557718aa2f7ed38e4ace519a5cbcf575434 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 27 Feb 2017 14:58:12 +0100
Subject: [PATCH] Fix public link for master key

In public link mode there is no session, so the code should use the
public key instead.
---
 apps/encryption/lib/KeyManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 26f023ed8f9..1e1f3231b8b 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -405,7 +405,7 @@ class KeyManager {
 			return '';
 		}
 
-		if ($this->util->isMasterKeyEnabled()) {
+		if (!is_null($uid) && $this->util->isMasterKeyEnabled()) {
 			$uid = $this->getMasterKeyId();
 		}