summaryrefslogtreecommitdiffstats
path: root/apps/theming/lib
diff options
context:
space:
mode:
Diffstat (limited to 'apps/theming/lib')
-rw-r--r--apps/theming/lib/ImageManager.php2
-rw-r--r--apps/theming/lib/ThemingDefaults.php5
-rw-r--r--apps/theming/lib/Util.php4
3 files changed, 5 insertions, 6 deletions
diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php
index 8c144bfe6ae..d377aa4f222 100644
--- a/apps/theming/lib/ImageManager.php
+++ b/apps/theming/lib/ImageManager.php
@@ -83,7 +83,7 @@ class ImageManager {
case 'logo':
case 'logoheader':
case 'favicon':
- return $this->urlGenerator->imagePath('core', 'logo.png') . '?v=' . $cacheBusterCounter;
+ return $this->urlGenerator->imagePath('core', 'logo/logo.png') . '?v=' . $cacheBusterCounter;
case 'background':
return $this->urlGenerator->imagePath('core', 'background.png') . '?v=' . $cacheBusterCounter;
}
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index 1df7a9f17bb..0573f7b84d7 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -33,7 +33,6 @@
namespace OCA\Theming;
-
use OCP\App\AppPathNotFoundException;
use OCP\App\IAppManager;
use OCP\Files\NotFoundException;
@@ -217,9 +216,9 @@ class ThemingDefaults extends \OC_Defaults {
if(!$logo || !$logoExists) {
if($useSvg) {
- $logo = $this->urlGenerator->imagePath('core', 'logo.svg');
+ $logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg');
} else {
- $logo = $this->urlGenerator->imagePath('core', 'logo.png');
+ $logo = $this->urlGenerator->imagePath('core', 'logo/logo.png');
}
return $logo . '?v=' . $cacheBusterCounter;
}
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() {