[stable29] fix(mail): Fix big logos in mail templates for Outlook #46627
Conversation
This file contains hidden or 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
Signed-off-by: Joas Schilling <[email protected]>
backportbot
bot
added
bug
3. to review
nickvergessen
approved these changes
Jul 19, 2024
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| } | ||
|
|
||
| if ($key === 'logo') { | ||
| $this->config->deleteAppValue('theming', 'logoDimensions'); |
Check notice
Code scanning / Psalm
DeprecatedMethod
| $content = file_get_contents($tmpFile); | ||
| $newImage = @imagecreatefromstring($content); | ||
| if ($newImage !== false) { | ||
| $this->config->setAppValue('theming', 'logoDimensions', imagesx($newImage) . 'x' . imagesy($newImage)); |
Check notice
Code scanning / Psalm
DeprecatedMethod
| } elseif (str_starts_with($detectedMimeType, 'image/svg')) { | ||
| $matched = preg_match('/viewbox=["\']\d* \d* (\d*\.?\d*) (\d*\.?\d*)["\']/i', $content, $matches); | ||
| if ($matched) { | ||
| $this->config->setAppValue('theming', 'logoDimensions', $matches[1] . 'x' . $matches[2]); |
Check notice
Code scanning / Psalm
DeprecatedMethod
| $this->config->setAppValue('theming', 'logoDimensions', $matches[1] . 'x' . $matches[2]); | ||
| } else { | ||
| $this->logger->warning('Could not read logo image dimensions to optimize for mail header'); | ||
| $this->config->deleteAppValue('theming', 'logoDimensions'); |
Check notice
Code scanning / Psalm
DeprecatedMethod
| } | ||
| } else { | ||
| $this->logger->warning('Could not read logo image dimensions to optimize for mail header'); | ||
| $this->config->deleteAppValue('theming', 'logoDimensions'); |
Check notice
Code scanning / Psalm
DeprecatedMethod
| $content = file_get_contents($tmpFile); | ||
| $newImage = @imagecreatefromstring($content); | ||
| if ($newImage !== false) { | ||
| $this->config->setAppValue('theming', 'logoDimensions', imagesx($newImage) . 'x' . imagesy($newImage)); |
Check notice
Code scanning / Psalm
PossiblyFalseOperand
| $content = file_get_contents($tmpFile); | ||
| $newImage = @imagecreatefromstring($content); | ||
| if ($newImage !== false) { | ||
| $this->config->setAppValue('theming', 'logoDimensions', imagesx($newImage) . 'x' . imagesy($newImage)); |
Check notice
Code scanning / Psalm
PossiblyFalseOperand
SystemKeeper
approved these changes
Jul 19, 2024
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.
Backport of PR #46419