upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #48452 from nextcloud/backport/48439/stable30

Browse source 
[stable30] fix(theming): Use `AppConfig` for setting background image
This commit is contained in:
Ferdinand Thiessen 2024-10-02 10:09:43 +02:00 committed by GitHub
commit b764ad7a3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/theming/lib/Service/BackgroundService.php
View file

@ -18,6 +18,7 @@ use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IAppConfig;
use OCP\IConfig;
use OCP\Lock\LockedException;
use OCP\PreConditionNotMetException;
@ -200,6 +201,7 @@ class BackgroundService {
public function __construct(
private IRootFolder $rootFolder,
private IAppData $appData,
private IAppConfig $appConfig,
private IConfig $config,
private ?string $userId,
) {
@ -328,7 +330,7 @@ class BackgroundService {
if ($handle && $image->loadFromFileHandle($handle) !== false) {
$meanColor = $this->calculateMeanColor($image);
if ($meanColor !== false) {
$this->config->setAppValue(Application::APP_ID, 'background_color', $meanColor);
$this->appConfig->setValueString(Application::APP_ID, 'background_color', $meanColor);
return $meanColor;
}
}

1
lib/private/Server.php
View file

@ -1153,6 +1153,7 @@ class Server extends ServerContainer implements IServerContainer {
$backgroundService = new BackgroundService(
$c->get(IRootFolder::class),
$c->getAppDataDir('theming'),
$c->get(IAppConfig::class),
$c->get(\OCP\IConfig::class),
$c->get(ISession::class)->get('user_id'),
);