Skip to content

[stable16] is_dir can be null on blacklisted files #408

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

Closed
backportbot-nextcloud wants to merge 2 commits into from
Closed

[stable16] is_dir can be null on blacklisted files #408

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a96992
is_dir can be null on blacklisted files
kokspflanze Nov 20, 2019
9abcacf
cast to bool
kokspflanze Nov 26, 2019
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
Next Next commit
is_dir can be null on blacklisted files 
Signed-off-by: KoKsPfLaNzE <[email protected]>
  • Loading branch information
@kokspflanze
kokspflanze authored and Backportbot committed Nov 27, 2019
commit 2a9699252f28cf149ce99a1e7327a2e098616c74
4 changes: 2 additions & 2 deletions lib/Controller/APIv2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ protected function getPreview(string $owner, int $fileId, string $filePath): arr
}

$preview = [
'link' => $this->getPreviewLink($info['path'], $info['is_dir'], $info['view']),
'link' => $this->getPreviewLink($info['path'], $info['is_dir'] ?? false, $info['view']),
'source' => '',
'mimeType' => 'application/octet-stream',
'isMimeTypeIcon' => true,
Expand Down Expand Up @@ -395,7 +395,7 @@ protected function getPreview(string $owner, int $fileId, string $filePath): arr
protected function getPreviewFromPath(int $fileId, string $filePath, array $info): array {
$mimeType = $info['is_dir'] ? 'dir' : $this->mimeTypeDetector->detectPath($filePath);
return [
'link' => $this->getPreviewLink($info['path'], $info['is_dir'], $info['view']),
'link' => $this->getPreviewLink($info['path'], $info['is_dir'] ?? false, $info['view']),
'source' => $this->getPreviewPathFromMimeType($mimeType),
'mimeType' => $mimeType,
'isMimeTypeIcon' => true,
Expand Down