diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-07-28 17:11:00 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-07-28 17:11:00 +0200 |
| commit | 1831ae9c9bf212149ab4b1a9f2fa1c1fd2604164 (patch) | |
| tree | a23d504a4177e6dd58932f60736b23a3d547211c | |
| parent | 51cbe2a0ee77529799817d5843a02bb5169751e6 (diff) | |
| parent | 87ec3fbf1d2c3efc7427c0e178ffb09ae2aacaac (diff) | |
| download | nextcloud-server-1831ae9c9bf212149ab4b1a9f2fa1c1fd2604164.tar.gz nextcloud-server-1831ae9c9bf212149ab4b1a9f2fa1c1fd2604164.zip | |
Merge pull request #9948 from owncloud/backport-9904-stable7
Dont throw an error when calling $server->getUserFolder when logged out
| -rw-r--r-- | lib/private/server.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index da705863078..3299792e20d 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -255,7 +255,11 @@ class Server extends SimpleContainer implements IServerContainer { * @return \OCP\Files\Folder */ function getUserFolder() { - $dir = '/' . \OCP\User::getUser(); + $user = $this->getUserSession()->getUser(); + if (!$user) { + return null; + } + $dir = '/' . $user->getUID(); $root = $this->getRootFolder(); $folder = null; |