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

Merge pull request #1837 from owncloud/fix-user-template 

Remove unneeded code for user layout template
This commit is contained in:
Lukas Reschke 2013-02-25 13:41:32 -08:00
parent a2a1e8c2cb bf0b9bac8b
commit 6735701c1e
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@
<ul id="settings" class="svg"> <ul id="settings" class="svg">
<span id="expand"> <span id="expand">
<?php echo $_['displayname'] ?> <?php echo $_['user_displayname'] ?>
<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" /> <img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
</span> </span>
<div id="expanddiv"> <div id="expanddiv">

5
lib/template.php
View File

@ -413,11 +413,6 @@ class OC_Template{
if( $this->renderas ) { if( $this->renderas ) {
$page = new OC_TemplateLayout($this->renderas); $page = new OC_TemplateLayout($this->renderas);
if($this->renderas == 'user') {
$page->assign('requesttoken', $this->vars['requesttoken']);
$user = OC_User::getUser();
$page->assign('displayname', OCP\User::getDisplayName($user));
}
// Add custom headers // Add custom headers
$page->assign('headers', $this->headers, false); $page->assign('headers', $this->headers, false);