summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-26 11:42:55 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-26 11:42:55 +0100
commit3da78c8f1c9355a726f289e834fa237366c3df20 (patch)
treea76dc72b6a175761540ec2b64479feaa784f664a
parent6cb95f4e42028f0959d4139593a16decbbc4b053 (diff)
parent2ecc202843282e223acca93d8302979aed35a9e1 (diff)
downloadnextcloud-server-3da78c8f1c9355a726f289e834fa237366c3df20.tar.gz
nextcloud-server-3da78c8f1c9355a726f289e834fa237366c3df20.zip
Merge pull request #21901 from owncloud/fix-setup
Fix setup page
-rw-r--r--lib/private/templatelayout.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index e14b070a7b4..7f17ab15335 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -151,11 +151,14 @@ class TemplateLayout extends \OC_Template {
// Send the language to our layouts
$this->assign('language', \OC_L10N::findLanguage());
-
- if(empty(self::$versionHash)) {
- $v = \OC_App::getAppVersions();
- $v['core'] = implode('.', \OCP\Util::getVersion());
- self::$versionHash = md5(implode(',', $v));
+ if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+ if (empty(self::$versionHash)) {
+ $v = \OC_App::getAppVersions();
+ $v['core'] = implode('.', \OCP\Util::getVersion());
+ self::$versionHash = md5(implode(',', $v));
+ }
+ } else {
+ self::$versionHash = md5('not installed');
}
$useAssetPipeline = self::isAssetPipelineEnabled();