Better error handling for custom logo upload #9471
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sgiehl
added
not-in-changelog
| @@ -196,18 +196,22 @@ private function uploadImage($uploadFieldName, $targetHeight, $userPath) | |||
| list($width, $height) = getimagesize($file); | |||
| switch ($_FILES[$uploadFieldName]['type']) { | |||
| case 'image/jpeg': | |||
| $image = imagecreatefromjpeg($file); | |||
| $image = @imagecreatefromjpeg($file); | |||
There was a problem hiding this comment.
I wonder if the @ actually needed as it would return false on any failure or not?
There was a problem hiding this comment.
Just asking as we kinda try to get rid of using @ :)
There was a problem hiding this comment.
It throws a warning if the file is invalid, which might be shown as notification.
There was a problem hiding this comment.
Cool, thx. Can you have a look at the other comment? Not sure if something is do on the other comment. If not, feel free to merge
sgiehl
force-pushed
the
customlogo_improvements
branch
2 times, most recently
from
f380362
to
83af7e3
Compare
sgiehl
force-pushed
the
customlogo_improvements
branch
from
83af7e3
to
5160e1f
Compare
tsteur
added a commit
that referenced
this pull request
Jan 11, 2016
Better error handling for custom logo upload
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As described in #7264 some errors while uploading a custom logo might occur.
Those errors weren't shown directly. Instead noting happened and the error is displayed after the next page reload.
To improve that behavior, I've suppressed those errors that might occur while opening an invalid file and implemented a simple error message that is displayed when the upload failed.
fixes #7264