mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bring another enable_avatars to $_ and fix $thus->$this

This commit is contained in:
kondou 2013-09-11 07:11:33 +02:00
parent 1832eb8872
commit bf7f94422f
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/layout.user.php
View File

@ -49,7 +49,7 @@
<span id="expand" tabindex="0" role="link"> <span id="expand" tabindex="0" role="link">
<span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> <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')); ?>" /> <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> <div class="avatardiv"></div>
<?php endif; ?> <?php endif; ?>
</span> </span>

2
lib/avatar.php
View File

@ -28,7 +28,7 @@ class OC_Avatar {
* @return boolean|\OC_Image containing the avatar or false if there's no image * @return boolean|\OC_Image containing the avatar or false if there's no image
*/ */
public function get ($size = 64) { public function get ($size = 64) {
if ($thus->view->file_exists('avatar.jpg')) { if ($this->view->file_exists('avatar.jpg')) {
$ext = 'jpg'; $ext = 'jpg';
} elseif ($this->view->file_exists('avatar.png')) { } elseif ($this->view->file_exists('avatar.png')) {
$ext = 'png'; $ext = 'png';

1
lib/templatelayout.php
View File

@ -46,6 +46,7 @@ class OC_TemplateLayout extends OC_Template {
$user_displayname = OC_User::getDisplayName(); $user_displayname = OC_User::getDisplayName();
$this->assign( 'user_displayname', $user_displayname ); $this->assign( 'user_displayname', $user_displayname );
$this->assign( 'user_uid', OC_User::getUser() ); $this->assign( 'user_uid', OC_User::getUser() );
$this->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
} else if ($renderas == 'guest' || $renderas == 'error') { } else if ($renderas == 'guest' || $renderas == 'error') {
parent::__construct('core', 'layout.guest'); parent::__construct('core', 'layout.guest');
} else { } else {