-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
generate user themed icons #35182
generate user themed icons #35182
Conversation
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.
To simplify the code, I would put a getCacheBuster
method in
https://github.com/nextcloud/server/blob/99191167167dd6c98dc3ae9b0eca947526e7939f/apps/theming/lib/Util.php
And use it from here.
You can then benefit from the dependency injection of the Util
class.
Just tested again and there seem to be some issue with the admin disabling user theming. So this needs to be verified as well... |
4db5142
to
2ccde00
Compare
2ccde00
to
4680a29
Compare
bdf6071
to
3762bcf
Compare
This works now and is ready for re-review :) |
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.
Please also directly integrate the system cachebuster into the Util
server/apps/theming/lib/Service/ThemeInjectionService.php
Lines 90 to 96 in abaa3ef
$cacheBuster = $this->config->getAppValue('theming', 'cachebuster', '0'); | |
if ($this->userId !== null) { | |
// need to bust the cache for the CSS file when the user background changed as its | |
// URL is served in those files | |
$userCacheBuster = $this->config->getUserValue($this->userId, Application::APP_ID, 'userCacheBuster', '0'); | |
$cacheBuster .= $this->userId . '_' . $userCacheBuster; | |
} |
That way we can standardise and use $this->util->getCacheBuster()
in ThemeInjectionService
too
5886533
to
756ee39
Compare
756ee39
to
5512b8b
Compare
8d5c994
to
b44cef3
Compare
a24eb65
to
2abad31
Compare
Signed-off-by: Simon L <szaimen@e.mail.de> Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com> Co-Authored-By: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
87aadfc
to
04b236e
Compare
Close #34654
Signed-off-by: Simon L szaimen@e.mail.de
For my own testing