tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4787 from marijnkampf/patch-6

Browse Source 
Fix Fatal error on invalid image
This commit is contained in:
Daniel Hensby 2015-11-25 14:25:15 +00:00
commit d9c38aa3cf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
forms/UploadField.php
View File

@ -870,11 +870,13 @@ class UploadField extends FileField {
$width = $this->getPreviewMaxWidth(); $width = $this->getPreviewMaxWidth();
$height = $this->getPreviewMaxHeight(); $height = $this->getPreviewMaxHeight();
if ($file->hasMethod('getThumbnail')) { if ($file->hasMethod('getThumbnail')) {
return $file->getThumbnail($width, $height)->getURL(); $r = $file->getThumbnail($width, $height);
if ($r) return $r->getURL();
} elseif ($file->hasMethod('getThumbnailURL')) { } elseif ($file->hasMethod('getThumbnailURL')) {
return $file->getThumbnailURL($width, $height); return $file->getThumbnailURL($width, $height);
} elseif ($file->hasMethod('Fit')) { } elseif ($file->hasMethod('Fit')) {
return $file->Fit($width, $height)->getURL(); $r = $file->Fit($width, $height);
if ($r) return $r->getURL();
} else { } else {
return $file->Icon(); return $file->Icon();
} }