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

Merge pull request #40125 from summersab/refactor/OC-Server-getThemingDefaults

Browse source
This commit is contained in:
John Molakvoæ 2024-03-15 17:03:30 +01:00 committed by GitHub
commit 27886aa184
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/AppFramework/DependencyInjection/DIContainer.php
View file

@ -173,7 +173,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
});
$this->registerService('OC_Defaults', function (ContainerInterface $c) {
return $c->get(IServerContainer::class)->getThemingDefaults();
return $c->get(IServerContainer::class)->get('ThemingDefaults');
});
$this->registerService('Protocol', function (ContainerInterface $c) {

2
lib/private/Console/Application.php
View file

@ -59,7 +59,7 @@ class Application {
IRequest $request,
LoggerInterface $logger,
MemoryInfo $memoryInfo) {
$defaults = \OC::$server->getThemingDefaults();
$defaults = \OC::$server->get('ThemingDefaults');
$this->config = $config;
$this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
$this->dispatcher = $dispatcher;

2
lib/private/Server.php
View file

@ -1348,7 +1348,7 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerService(Defaults::class, function (Server $c) {
return new Defaults(
$c->getThemingDefaults()
$c->get('ThemingDefaults')
);
});
/** @deprecated 19.0.0 */

4
lib/private/URLGenerator.php
View file

@ -226,7 +226,7 @@ class URLGenerator implements IURLGenerator {
$themingEnabled = $this->config->getSystemValueBool('installed', false) && $this->getAppManager()->isEnabledForUser('theming');
$themingImagePath = false;
if ($themingEnabled) {
$themingDefaults = \OC::$server->getThemingDefaults();
$themingDefaults = \OC::$server->get('ThemingDefaults');
if ($themingDefaults instanceof ThemingDefaults) {
$themingImagePath = $themingDefaults->replaceImagePath($appName, $file);
}
@ -299,7 +299,7 @@ class URLGenerator implements IURLGenerator {
* @return string url to the online documentation
*/
public function linkToDocs(string $key): string {
$theme = \OC::$server->getThemingDefaults();
$theme = \OC::$server->get('ThemingDefaults');
return $theme->buildDocLinkToKey($key);
}

2
lib/public/Defaults.php
View file

@ -52,7 +52,7 @@ class Defaults {
*/
public function __construct(\OC_Defaults $defaults = null) {
if ($defaults === null) {
$defaults = \OC::$server->getThemingDefaults();
$defaults = \OC::$server->get('ThemingDefaults');
}
$this->defaults = $defaults;
}