diff options
| author | kondou <kondou@ts.unde.re> | 2014-03-15 15:27:48 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-10-23 23:17:18 +0200 |
| commit | 729dffed5ec924492962a41b4697ca05ad40da79 (patch) | |
| tree | ac9cf4391a14953c03cab1564a2ff1e4c0e0cd6a /lib/private | |
| parent | e26a16afea14df7428dd614906fc94521538dfe3 (diff) | |
| download | nextcloud-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')
| -rw-r--r-- | lib/private/helper.php | 15 | ||||
| -rw-r--r-- | lib/private/templatelayout.php | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index 823e82ceeb1..628af14fa08 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -280,6 +280,21 @@ class OC_Helper { } /** + * shows whether the user has an avatar + * @param string $user username + * @return bool avatar set or not + **/ + public static function userAvatarSet($user) { + $avatar = new \OC_Avatar($user); + $image = $avatar->get(1); + if ($image instanceof \OC_Image) { + return true; + } else { + return false; + } + } + + /** * Make a human file size * @param int $bytes file size in bytes * @return string a human readable file size 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))); |