diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-02-03 08:25:57 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-02-03 19:25:29 +0100 |
| commit | 453ea6698d495ec6721605f040f0fdd31d588c0b (patch) | |
| tree | 6e476933be067738333a1a64ee0f0af6565a126a /apps/files_sharing/lib | |
| parent | c1841892d056c26ee3342cde1276570fbdcad59e (diff) | |
| download | nextcloud-server-453ea6698d495ec6721605f040f0fdd31d588c0b.tar.gz nextcloud-server-453ea6698d495ec6721605f040f0fdd31d588c0b.zip | |
[Share 2.0] Fix public link sharing
Diffstat (limited to 'apps/files_sharing/lib')
| -rw-r--r-- | apps/files_sharing/lib/controllers/sharecontroller.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php index 6ac585e275c..bbe68096b52 100644 --- a/apps/files_sharing/lib/controllers/sharecontroller.php +++ b/apps/files_sharing/lib/controllers/sharecontroller.php @@ -232,8 +232,8 @@ class ShareController extends Controller { } $shareTmpl = []; - $shareTmpl['displayName'] = $share->getShareOwner()->getDisplayName(); - $shareTmpl['owner'] = $share->getShareOwner()->getUID(); + $shareTmpl['displayName'] = $this->userManager->get($share->getShareOwner())->getDisplayName(); + $shareTmpl['owner'] = $share->getShareOwner(); $shareTmpl['filename'] = $share->getNode()->getName(); $shareTmpl['directory_path'] = $share->getTarget(); $shareTmpl['mimetype'] = $share->getNode()->getMimetype(); @@ -320,7 +320,7 @@ class ShareController extends Controller { } } - $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner()->getUID()); + $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner()); $originalSharePath = $userFolder->getRelativePath($share->getNode()->getPath()); // Single file share @@ -330,7 +330,7 @@ class ShareController extends Controller { $event->setApp('files_sharing') ->setType(Activity::TYPE_PUBLIC_LINKS) ->setSubject(Activity::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED, [$userFolder->getRelativePath($share->getNode()->getPath())]) - ->setAffectedUser($share->getShareOwner()->getUID()) + ->setAffectedUser($share->getShareOwner()) ->setObject('files', $share->getNode()->getId(), $userFolder->getRelativePath($share->getNode()->getPath())); $this->activityManager->publish($event); } @@ -356,7 +356,7 @@ class ShareController extends Controller { $event->setApp('files_sharing') ->setType(Activity::TYPE_PUBLIC_LINKS) ->setSubject(Activity::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED, [$userFolder->getRelativePath($node->getPath())]) - ->setAffectedUser($share->getShareOwner()->getUID()) + ->setAffectedUser($share->getShareOwner()) ->setObject('files', $node->getId(), $userFolder->getRelativePath($node->getPath())); $this->activityManager->publish($event); } else if (!empty($files_list)) { @@ -369,7 +369,7 @@ class ShareController extends Controller { $event = $this->activityManager->generateEvent(); $event->setApp('files_sharing') ->setType(Activity::TYPE_PUBLIC_LINKS) - ->setAffectedUser($share->getShareOwner()->getUID()) + ->setAffectedUser($share->getShareOwner()) ->setObject('files', $subNode->getId(), $userFolder->getRelativePath($subNode->getPath())); if ($subNode instanceof \OCP\Files\File) { @@ -386,7 +386,7 @@ class ShareController extends Controller { $event->setApp('files_sharing') ->setType(Activity::TYPE_PUBLIC_LINKS) ->setSubject(Activity::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED, [$userFolder->getRelativePath($node->getPath())]) - ->setAffectedUser($share->getShareOwner()->getUID()) + ->setAffectedUser($share->getShareOwner()) ->setObject('files', $node->getId(), $userFolder->getRelativePath($node->getPath())); $this->activityManager->publish($event); } @@ -394,7 +394,7 @@ class ShareController extends Controller { /* FIXME: We should do this all nicely in OCP */ OC_Util::tearDownFS(); - OC_Util::setupFS($share->getShareOwner()->getUID()); + OC_Util::setupFS($share->getShareOwner()); /** * this sets a cookie to be able to recognize the start of the download |