Skip to content

Scrutinizer fixes #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 9 commits into from
Jul 8, 2016
Merged

Scrutinizer fixes #317

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8f84c99
Fix undefined properties
icewind1991 Jul 5, 2016
f0b9eba
dont overwrite a variable with a different type
icewind1991 Jul 5, 2016
951ff08
hint global handlebars
icewind1991 Jul 5, 2016
31ea10b
add missing var
icewind1991 Jul 5, 2016
f98cb9e
Fix type hinting
icewind1991 Jul 5, 2016
4de7476
Allow null
icewind1991 Jul 5, 2016
039f730
handle errors while getting fileinfo
icewind1991 Jul 5, 2016
d0e6fdb
combine if statements
icewind1991 Jul 5, 2016
6da066e
Fix test using private propertries
icewind1991 Jul 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
combine if statements
  • Loading branch information
@icewind1991 @LukasReschke
icewind1991 authored and LukasReschke committed Jul 8, 2016
commit d0e6fdba4d38ad7d7d7e95ec4cb752d8b609af5c
23 changes: 10 additions & 13 deletions apps/files_sharing/lib/Controllers/ShareController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,19 +285,6 @@ public function showShare($token, $path = '') {
throw $e;
}

$rootFolder = null;
if ($share->getNode() instanceof \OCP\Files\Folder) {
/** @var \OCP\Files\Folder $rootFolder */
$rootFolder = $share->getNode();

try {
$folderNode = $rootFolder->get($path);
} catch (\OCP\Files\NotFoundException $e) {
$this->emitAccessShareHook($share, 404, 'Share not found');
throw new NotFoundException();
}
}

$shareTmpl = [];
$shareTmpl['displayName'] = $this->userManager->get($share->getShareOwner())->getDisplayName();
$shareTmpl['owner'] = $share->getShareOwner();
Expand All @@ -316,6 +303,16 @@ public function showShare($token, $path = '') {
// Show file list
$hideFileList = false;
if ($share->getNode() instanceof \OCP\Files\Folder) {
/** @var \OCP\Files\Folder $rootFolder */
$rootFolder = $share->getNode();

try {
$folderNode = $rootFolder->get($path);
} catch (\OCP\Files\NotFoundException $e) {
$this->emitAccessShareHook($share, 404, 'Share not found');
throw new NotFoundException();
}

$shareTmpl['dir'] = $rootFolder->getRelativePath($folderNode->getPath());

/*
Expand Down