mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8689 from nextcloud/12-7449 

[stable12] Fix 500 on setup page
This commit is contained in:
Morris Jobke 2018-03-06 18:00:40 +01:00 committed by GitHub
parent 6acc307aa3 51b79a5df4
commit 36c9b12fd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/private/TemplateLayout.php
View File

@ -102,7 +102,7 @@ class TemplateLayout extends \OC_Template {
$this->assign('userAvatarSet', false); $this->assign('userAvatarSet', false);
} else { } else {
$this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists()); $this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());
$this->assign('userAvatarVersion', \OC::$server->getConfig()->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0)); $this->assign('userAvatarVersion', $this->config->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0));
} }
// check if app menu icons should be inverted // check if app menu icons should be inverted
@ -148,7 +148,7 @@ class TemplateLayout extends \OC_Template {
\OC::$server->getAppManager(), \OC::$server->getAppManager(),
\OC::$server->getSession(), \OC::$server->getSession(),
\OC::$server->getUserSession()->getUser(), \OC::$server->getUserSession()->getUser(),
\OC::$server->getConfig(), $this->config,
\OC::$server->getGroupManager(), \OC::$server->getGroupManager(),
\OC::$server->getIniWrapper(), \OC::$server->getIniWrapper(),
\OC::$server->getURLGenerator() \OC::$server->getURLGenerator()
@ -205,18 +205,26 @@ class TemplateLayout extends \OC_Template {
* @return string * @return string
*/ */
protected function getVersionHashSuffix($path = false, $file = false) { protected function getVersionHashSuffix($path = false, $file = false) {
if (\OC::$server->getConfig()->getSystemValue('debug', false)) { if ($this->config->getSystemValue('debug', false)) {
// allows chrome workspace mapping in debug mode // allows chrome workspace mapping in debug mode
return ""; return "";
} }
$themingSuffix = '';
$v = [];
if ($this->config->getSystemValue('installed', false)) {
if (\OC::$server->getAppManager()->isInstalled('theming')) {
$themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
}
$v = \OC_App::getAppVersions(); $v = \OC_App::getAppVersions();
}
// Try the webroot path for a match // Try the webroot path for a match
if ($path !== false && $path !== '') { if ($path !== false && $path !== '') {
$appName = $this->getAppNamefromPath($path); $appName = $this->getAppNamefromPath($path);
if(array_key_exists($appName, $v)) { if(array_key_exists($appName, $v)) {
$appVersion = $v[$appName]; $appVersion = $v[$appName];
return '?v=' . substr(md5($appVersion), 0, 8) . '-' . $this->config->getAppValue('theming', 'cachebuster', '0'); return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
} }
} }
// fallback to the file path instead // fallback to the file path instead
@ -224,14 +232,11 @@ class TemplateLayout extends \OC_Template {
$appName = $this->getAppNamefromPath($file); $appName = $this->getAppNamefromPath($file);
if(array_key_exists($appName, $v)) { if(array_key_exists($appName, $v)) {
$appVersion = $v[$appName]; $appVersion = $v[$appName];
return '?v=' . substr(md5($appVersion), 0, 8) . '-' . $this->config->getAppValue('theming', 'cachebuster', '0'); return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
} }
} }
if ($this->config->getSystemValue('installed', false) && \OC::$server->getAppManager()->isInstalled('theming')) { return '?v=' . self::$versionHash . $themingSuffix;
return '?v=' . self::$versionHash . '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
}
return '?v=' . self::$versionHash;
} }
/** /**