-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix primary color usage in emails and federation #36348
Fix primary color usage in emails and federation #36348
Conversation
public function getDefaultColorPrimary(): string { | ||
if (method_exists($this->defaults, 'getDefaultColorPrimary')) { | ||
return $this->defaults->getDefaultColorPrimary(); | ||
} | ||
return $this->defaults->getColorPrimary(); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getDefaultColorPrimary
should always be available no?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
public function getColorPrimary() { | |
if ($this->themeExist('getColorPrimary')) { | |
return $this->theme->getColorPrimary(); | |
} | |
if ($this->themeExist('getMailHeaderColor')) { | |
return $this->theme->getMailHeaderColor(); | |
} | |
return $this->defaultColorPrimary; | |
} |
That's a cleanup task for another day.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok then
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🐘
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>
6335d76
to
959e2aa
Compare
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
#ffffff
Checklist