Skip to content

[stable17] is_dir can be null on blacklisted files #407

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
nickvergessen merged 2 commits into from
Nov 27, 2019
Merged

[stable17] is_dir can be null on blacklisted files #407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5b6987
is_dir can be null on blacklisted files
kokspflanze Nov 20, 2019
791f961
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
Prev Previous commit
cast to bool
  • Loading branch information
@kokspflanze
kokspflanze authored and Backportbot committed Nov 26, 2019
commit 791f961f12c1c20df5c83aeecedba0e0f86b38b6
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'] ?? false, $info['view']),
'link' => $this->getPreviewLink($info['path'], $info['is_dir'], $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'] ?? false, $info['view']),
'link' => $this->getPreviewLink($info['path'], $info['is_dir'], $info['view']),
'source' => $this->getPreviewPathFromMimeType($mimeType),
'mimeType' => $mimeType,
'isMimeTypeIcon' => true,
Expand Down
4 changes: 2 additions & 2 deletions lib/ViewInfoCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ protected function findInfoByPath($user, $path) {
$this->cachePath[$user][$path] = [
'path' => $path,
'exists' => $exists,
'is_dir' => $exists ? $this->view->is_dir($path) : false,
'is_dir' => $exists ? (bool)$this->view->is_dir($path) : false,
'view' => '',
];

Expand Down Expand Up @@ -128,7 +128,7 @@ protected function findInfoById($user, $fileId, $filePath) {
$cache = [
'path' => substr($path, strlen('/files')),
'exists' => true,
'is_dir' => $this->view->is_dir($path),
'is_dir' => (bool)$this->view->is_dir($path),
'view' => 'trashbin',
];
} catch (NotFoundException $e) {
Expand Down