summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-02-22 00:22:43 +0100
committerBart Visscher <bartv@thisnet.nl>2013-02-22 00:22:43 +0100
commitbf0b9bac8b10afccb5d98d4272ed1a311ed99042 (patch)
tree22a635f525bda30188f56f568a26923f723bc461
parent40a5a526841d379da5d554a6f69ad0aef25acb7d (diff)
downloadnextcloud-server-bf0b9bac8b10afccb5d98d4272ed1a311ed99042.tar.gz
nextcloud-server-bf0b9bac8b10afccb5d98d4272ed1a311ed99042.zip
Remove unneeded code for user layout template
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--lib/template.php5
2 files changed, 1 insertions, 6 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2d00bdb5c8e..00b60070d4d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -31,7 +31,7 @@
<ul id="settings" class="svg">
<span id="expand">
- <?php echo $_['displayname'] ?>
+ <?php echo $_['user_displayname'] ?>
<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
</span>
<div id="expanddiv">
diff --git a/lib/template.php b/lib/template.php
index 3df5a24f946..e79c0d55c96 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -413,11 +413,6 @@ class OC_Template{
if( $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
$page->assign('headers', $this->headers, false);