summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-05 16:36:04 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-05 16:36:04 +0100
commit7568c402751f8387bcf8149cb303f02618205980 (patch)
tree5341bb8ee8229e554299d3f3f8e7758f8e81ca96
parent0196f0e54643e3a0b17588cb9f4c54d7d73c5b29 (diff)
parentf4edfb6dfb7208c1479375efea60f50c61eb2e09 (diff)
downloadnextcloud-server-7568c402751f8387bcf8149cb303f02618205980.tar.gz
nextcloud-server-7568c402751f8387bcf8149cb303f02618205980.zip
Merge pull request #22159 from owncloud/fix_21678
Gracefull handle link shares rename hook
-rw-r--r--apps/files_sharing/lib/updater.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
index 9a1e554046b..10da2462807 100644
--- a/apps/files_sharing/lib/updater.php
+++ b/apps/files_sharing/lib/updater.php
@@ -73,6 +73,12 @@ class Shared_Updater {
*/
static private function moveShareToShare($path) {
$userFolder = \OC::$server->getUserFolder();
+
+ // If the user folder can't be constructed (e.g. link share) just return.
+ if ($userFolder === null) {
+ return;
+ }
+
$src = $userFolder->get($path);
$type = $src instanceof \OCP\Files\File ? 'file' : 'folder';