summaryrefslogtreecommitdiffstats
path: root/lib/private/templatelayout.php
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2014-03-15 15:27:48 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-10-23 23:17:18 +0200
commit729dffed5ec924492962a41b4697ca05ad40da79 (patch)
treeac9cf4391a14953c03cab1564a2ff1e4c0e0cd6a /lib/private/templatelayout.php
parente26a16afea14df7428dd614906fc94521538dfe3 (diff)
downloadnextcloud-server-729dffed5ec924492962a41b4697ca05ad40da79.tar.gz
nextcloud-server-729dffed5ec924492962a41b4697ca05ad40da79.zip
Load avatar in header via PHP
* fix #7484 * use UID, css, and div instead of span
Diffstat (limited to 'lib/private/templatelayout.php')
-rw-r--r--lib/private/templatelayout.php3
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)));