diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-10-24 01:27:25 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-10-24 01:27:25 +0200 |
| commit | 4b5a3876ac9df45dac8231d00b427bdcdbcf8411 (patch) | |
| tree | befb2d49935eb7618c19056797bdee539d9a0a32 /lib/private/templatelayout.php | |
| parent | 46dd59f47b8e916841c6a5f1d1bd52752b78e3a1 (diff) | |
| parent | a10b25587f938b80c6e8c2efd1493c0036f3cb2e (diff) | |
| download | nextcloud-server-4b5a3876ac9df45dac8231d00b427bdcdbcf8411.tar.gz nextcloud-server-4b5a3876ac9df45dac8231d00b427bdcdbcf8411.zip | |
Merge pull request #7749 from owncloud/load_avatar_header_via_php
Load avatar in header via PHP
Diffstat (limited to 'lib/private/templatelayout.php')
| -rw-r--r-- | lib/private/templatelayout.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index f5f079c8b2a..cbaadd5768f 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -76,6 +76,7 @@ class OC_TemplateLayout extends OC_Template { $this->assign( 'user_uid', OC_User::getUser() ); $this->assign( 'appsmanagement_active', strpos(OC_Request::requestUri(), OC_Helper::linkToRoute('settings_apps')) === 0 ); $this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true)); + $this->assign('userAvatarSet', \OC_Helper::userAvatarSet(OC_User::getUser())); } else if ($renderAs == 'error') { parent::__construct('core', 'layout.guest', '', false); $this->assign('bodyid', 'body-login'); @@ -89,7 +90,7 @@ class OC_TemplateLayout extends OC_Template { if(empty(self::$versionHash)) { self::$versionHash = md5(implode(',', OC_App::getAppVersions())); } - + $useAssetPipeline = self::isAssetPipelineEnabled(); if ($useAssetPipeline) { $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash))); |