Uh oh!
There was an error while loading. Please reload this page.
Fix primary color usage in emails and federation - #36348
Merged
nickvergessen merged 3 commits intoJan 30, 2023
Merged
Conversation
nickvergessen
requested review from
Pytal and szaimen
and removed request for
a teamJanuary 25, 2023 10:00
Comment on lines
+213
to
+218
| public function getDefaultColorPrimary(): string { | ||
| if (method_exists($this->defaults, 'getDefaultColorPrimary')) { | ||
| return $this->defaults->getDefaultColorPrimary(); | ||
| } | ||
| return $this->defaults->getColorPrimary(); | ||
| } |
Member
There was a problem hiding this comment.
getDefaultColorPrimary should always be available no?
MemberAuthor
There was a problem hiding this comment.
OC_Defaults only has getColorPrimary and I'm unwilling to debug which version of the defaults object is used where and why.
server/lib/private/legacy/OC_Defaults.php
Lines 301 to 309 in 3860dad
That's a cleanup task for another day.
skjnldsv
approved these changes
Jan 25, 2023
Pytal
approved these changes
Jan 25, 2023
nickvergessen
commented
Jan 25, 2023
MemberAuthor
Of course there are tests which checks which method is invoked, when getting color in the email... will have a look tomorrow. |
Signed-off-by: Joas Schilling <coding@schilljs.com>
…user triggering the email Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
nickvergessenforce-pushed
the
bugfix/noid/fix-primary-color-usage-in-emails-and-federation
branch
from
January 30, 2023 08:13
6335d76 to
959e2aaComparenickvergessen
enabled auto-merge
January 30, 2023 08:53
nickvergessen
deleted the
bugfix/noid/fix-primary-color-usage-in-emails-and-federation
branch
January 30, 2023 08:56
Merged
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
Sign up for freeto 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.
Summary
2 sample emails from the same day, same instance, no settings changed on my side:
server/apps/encryption/templates/mail.php
Line 9 in 304c1b9
Screenshots
#DF2254#ffffffChecklist