diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-11 07:11:33 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-11 07:11:33 +0200 |
| commit | bf7f94422fc86558f71e11117caee0758266a163 (patch) | |
| tree | e1fb857118a8e58c082ec680798a2fce5a2f9c30 | |
| parent | 1832eb88726dce70d4f8a0a45bd574b0b688ab26 (diff) | |
| download | nextcloud-server-bf7f94422fc86558f71e11117caee0758266a163.tar.gz nextcloud-server-bf7f94422fc86558f71e11117caee0758266a163.zip | |
Bring another enable_avatars to $_ and fix $thus->$this
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | lib/avatar.php | 2 | ||||
| -rw-r--r-- | lib/templatelayout.php | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index cd303104e0c..71bec11d219 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -49,7 +49,7 @@ <span id="expand" tabindex="0" role="link"> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /> - <?php if (\OC_Config::getValue('enable_avatars', true) === true): ?> + <?php if ($_['enableAvatars']): ?> <div class="avatardiv"></div> <?php endif; ?> </span> diff --git a/lib/avatar.php b/lib/avatar.php index c07ef537d50..f20980c364b 100644 --- a/lib/avatar.php +++ b/lib/avatar.php @@ -28,7 +28,7 @@ class OC_Avatar { * @return boolean|\OC_Image containing the avatar or false if there's no image */ public function get ($size = 64) { - if ($thus->view->file_exists('avatar.jpg')) { + if ($this->view->file_exists('avatar.jpg')) { $ext = 'jpg'; } elseif ($this->view->file_exists('avatar.png')) { $ext = 'png'; diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 0b868a39e49..625f3424a04 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -46,6 +46,7 @@ class OC_TemplateLayout extends OC_Template { $user_displayname = OC_User::getDisplayName(); $this->assign( 'user_displayname', $user_displayname ); $this->assign( 'user_uid', OC_User::getUser() ); + $this->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true)); } else if ($renderas == 'guest' || $renderas == 'error') { parent::__construct('core', 'layout.guest'); } else { |