diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-11-21 13:57:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 13:57:48 +0100 |
| commit | 3d9077ae3a29ab9f44ac581d7661cda0ef2d52a7 (patch) | |
| tree | 423ad990fc3d0eadc4e5988072db6175e78a28a4 /lib | |
| parent | 94004cf46bb676255c88a1f0d08866d3904945ec (diff) | |
| parent | 9bc4ac367fb5549c68fbe5baa639dfc6cc87b1c1 (diff) | |
| download | nextcloud-server-3d9077ae3a29ab9f44ac581d7661cda0ef2d52a7.tar.gz nextcloud-server-3d9077ae3a29ab9f44ac581d7661cda0ef2d52a7.zip | |
Merge pull request #2212 from nextcloud/fix_web_installer
Do not trigger appconfig queries when we are not yet installed
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/URLGenerator.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index f041487ea88..c6f1ebd4594 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -158,11 +158,12 @@ class URLGenerator implements IURLGenerator { // Check if the app is in the app folder $path = ''; - if(\OCP\App::isEnabled('theming') && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) { + $themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming'); + if($themingEnabled && $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" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) { + } elseif($themingEnabled && $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; |