diff options
| author | Julius Haertl <jus@bitgrid.net> | 2016-08-30 09:03:42 +0200 |
|---|---|---|
| committer | Julius Haertl <jus@bitgrid.net> | 2016-11-18 10:23:24 +0100 |
| commit | 237034818dd3425116ef3db04dabbc95a5d10125 (patch) | |
| tree | f44059db620a6c74215d43ffec10b9f6db8b79bf /lib/private/URLGenerator.php | |
| parent | af8976ab03d976bba04a2442957a650728de7ecb (diff) | |
| download | nextcloud-server-237034818dd3425116ef3db04dabbc95a5d10125.tar.gz nextcloud-server-237034818dd3425116ef3db04dabbc95a5d10125.zip | |
Check if dynamic icons can be used
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/URLGenerator.php')
| -rw-r--r-- | lib/private/URLGenerator.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index 8290fcb1337..bdf7bdafae3 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -157,11 +157,11 @@ class URLGenerator implements IURLGenerator { // Check if the app is in the app folder $path = ''; - if(\OCP\App::isEnabled('theming') && $image === "favicon.ico") { + if(\OCP\App::isEnabled('theming') && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) { $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0'); if($app==="") { $app = "core"; } $path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]) . '?v='. $cacheBusterValue; - } elseif(\OCP\App::isEnabled('theming') && $image === "favicon-touch.png") { + } elseif(\OCP\App::isEnabled('theming') && $image === "favicon-touch.png" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) { $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0'); if($app==="") { $app = "core"; } $path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]) . '?v='. $cacheBusterValue; |