Skip to content

Avoid substr() error when strpos returns false #21844

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
MorrisJobke merged 2 commits into from
Jul 15, 2020
Merged

Avoid substr() error when strpos returns false #21844

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dafd58
Avoid substr() error when strpos returns false
bladewing Jul 14, 2020
3fe3d1f
Extra white space to follow other ifs
bladewing Jul 14, 2020
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
Extra white space to follow other ifs 
Signed-off-by: lui87kw <[email protected]>
  • Loading branch information
@bladewing
bladewing committed Jul 15, 2020
commit 3fe3d1fca32a033692201705bb59992f140e8799
2 changes: 1 addition & 1 deletion lib/private/Files/Type/Detection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ public function mimeTypeIcon($mimetype): string {

// Try only the first part of the filetype

if(strpos($icon, '-')) {
if (strpos($icon, '-')) {
$mimePart = substr($icon, 0, strpos($icon, '-'));
try {
$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
Expand Down