From bf7f94422fc86558f71e11117caee0758266a163 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Wed, 11 Sep 2013 07:11:33 +0200
Subject: [PATCH] Bring another enable_avatars to $_ and fix $thus->$this
---
core/templates/layout.user.php | 2 +-
lib/avatar.php | 2 +-
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 cd303104e0..71bec11d21 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 c07ef537d5..f20980c364 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 0b868a39e4..625f3424a0 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 {
--
GitLab