From 044ab0cbecf46d537e892dfa4efd862182798291 Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Thu, 4 Oct 2018 20:43:27 +0200
Subject: [PATCH] Adapts the theming util to the new core logo image path
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
---
apps/theming/lib/Util.php | 4 ++--
apps/theming/tests/UtilTest.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index b17382334d0..38b876f3610 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -161,7 +161,7 @@ class Util {
}
} catch (NotFoundException $e) {}
}
- return \OC::$SERVERROOT . '/core/img/logo.svg';
+ return \OC::$SERVERROOT . '/core/img/logo/logo.svg';
}
/**
@@ -223,7 +223,7 @@ class Util {
/**
* Check if a custom theme is set in the server configuration
- *
+ *
* @return bool
*/
public function isAlreadyThemed() {
diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php
index 6348f8423eb..d0263e11224 100644
--- a/apps/theming/tests/UtilTest.php
+++ b/apps/theming/tests/UtilTest.php
@@ -139,7 +139,7 @@ class UtilTest extends TestCase {
public function dataGetAppIcon() {
return [
['user_ldap', \OC_App::getAppPath('user_ldap') . '/img/app.svg'],
- ['noapplikethis', \OC::$SERVERROOT . '/core/img/logo.svg'],
+ ['noapplikethis', \OC::$SERVERROOT . '/core/img/logo/logo.svg'],
['comments', \OC_App::getAppPath('comments') . '/img/comments.svg'],
];
}
--
GitLab