From 9ac5476c4eb4d286ae1c48996e916180e3a54035 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Thu, 25 Aug 2016 16:19:22 +0200 Subject: [PATCH] Add cachebuster to favicons Signed-off-by: Julius Haertl --- lib/private/URLGenerator.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index f8b79dedd8e..8290fcb1337 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -158,11 +158,13 @@ class URLGenerator implements IURLGenerator { // Check if the app is in the app folder $path = ''; if(\OCP\App::isEnabled('theming') && $image === "favicon.ico") { + $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0'); if($app==="") { $app = "core"; } - $path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]); + $path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]) . '?v='. $cacheBusterValue; } elseif(\OCP\App::isEnabled('theming') && $image === "favicon-touch.png") { + $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0'); if($app==="") { $app = "core"; } - $path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]); + $path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]) . '?v='. $cacheBusterValue; } elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) { $path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image"; } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.svg") -- 2.39.5