From bf0b9bac8b10afccb5d98d4272ed1a311ed99042 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 22 Feb 2013 00:22:43 +0100
Subject: [PATCH] Remove unneeded code for user layout template

---
 core/templates/layout.user.php | 2 +-
 lib/template.php               | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2d00bdb5c8..00b60070d4 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 3df5a24f94..e79c0d55c9 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);