diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2017-02-27 14:58:12 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2017-03-24 14:55:12 +0100 |
| commit | 43c081bdc9cf9cabfa29d39babb6fa6454331ebb (patch) | |
| tree | 92f9b27a79a5c7e19789b2ddaced9509bfa5709b /apps | |
| parent | b79211e4ae6fb4ce10b587b8d1f612cdf860353d (diff) | |
| download | nextcloud-server-43c081bdc9cf9cabfa29d39babb6fa6454331ebb.tar.gz nextcloud-server-43c081bdc9cf9cabfa29d39babb6fa6454331ebb.zip | |
Fix public link for master key
In public link mode there is no session, so the code should use the
public key instead.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/encryption/lib/KeyManager.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php index caae154b2d3..a6708df9a1c 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(); } |