Remove unneeded code for user layout template

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2d00bdb5c8ec9874832ccce416c99396132fccb3..00b60070d4db116312cfd68faeb0ac21985e9c96 100644 (file)
--- 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 3df5a24f946cb3db3c95a65671e2ee64606c2229..e79c0d55c96bfeb609836ed6743fccfc4ee81a8e 100644 (file)
--- 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);