diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-05-02 21:49:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 21:49:14 +0200 |
| commit | 24ff230f938bb9c47bbd75a133af84314b42aca7 (patch) | |
| tree | 6919c65502964fea435abe070d0e544dae6e38dd /lib/private/PreviewManager.php | |
| parent | 34b8ea6ebf0cbe873804e1fb8d7d87859d3bb8e9 (diff) | |
| parent | 2847e9f2e3e5f338ba1b727ea207b2c549d38e92 (diff) | |
| download | nextcloud-server-24ff230f938bb9c47bbd75a133af84314b42aca7.tar.gz nextcloud-server-24ff230f938bb9c47bbd75a133af84314b42aca7.zip | |
Merge pull request #4620 from nextcloud/preview-error-handling
better handling of preview generation errors
Diffstat (limited to 'lib/private/PreviewManager.php')
| -rw-r--r-- | lib/private/PreviewManager.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index 8c5a7ad29f1..12fcc292c63 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -182,7 +182,8 @@ class PreviewManager implements IPreview { * @param string $mimeType * @return ISimpleFile * @throws NotFoundException - * @since 11.0.0 + * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid) + * @since 11.0.0 - \InvalidArgumentException was added in 12.0.0 */ public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) { if ($this->generator === null) { |