diff options
| author | Josh <josh.t.richards@gmail.com> | 2024-04-08 07:32:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-08 07:32:36 -0400 |
| commit | ff2100a4e515988d3ba44c7cfe734d19a6b4b377 (patch) | |
| tree | e860e83bd14e1d4016d23ccb2246d341506d6682 | |
| parent | e10853450e4f327d146c2874f175d2a9102a959a (diff) | |
| parent | e02a06072b12fa07f19d6cd746188bfeb8bd8685 (diff) | |
| download | nextcloud-server-ff2100a4e515988d3ba44c7cfe734d19a6b4b377.tar.gz nextcloud-server-ff2100a4e515988d3ba44c7cfe734d19a6b4b377.zip | |
Merge pull request #44705 from nextcloud/fix/issue-44702
fix(Blurhash): Suppress imagecreatefromstring() E_WARNING
| -rw-r--r-- | lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php index b57dfa317e4..4c1a966670b 100644 --- a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php +++ b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php @@ -88,7 +88,7 @@ class GenerateBlurhashMetadata implements IEventListener { try { // using preview image to generate the blurhash $preview = $this->preview->getPreview($file, 256, 256); - $image = imagecreatefromstring($preview->getContent()); + $image = @imagecreatefromstring($preview->getContent()); } catch (NotFoundException $e) { // https://github.com/nextcloud/server/blob/9d70fd3e64b60a316a03fb2b237891380c310c58/lib/private/legacy/OC_Image.php#L668 // The preview system can fail on huge picture, in that case we use our own image resizer. @@ -114,7 +114,7 @@ class GenerateBlurhashMetadata implements IEventListener { * @throws LockedException */ private function resizedImageFromFile(File $file): GdImage|false { - $image = imagecreatefromstring($file->getContent()); + $image = @imagecreatefromstring($file->getContent()); if ($image === false) { return false; } |