Merge pull request #2587 from nextcloud/theming-app-not-loaded

Check if the theming app is loaded
This commit is contained in:
Morris Jobke 2016-12-09 16:34:33 +01:00 committed by GitHub
commit 0de83a3a01

View file

@ -158,7 +158,7 @@ class URLGenerator implements IURLGenerator {
// Check if the app is in the app folder
$path = '';
$themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming');
$themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming') && \OC_App::isAppLoaded('theming');
if($themingEnabled && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
if($app==="") { $app = "core"; }