diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-02-25 13:41:32 -0800 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-02-25 13:41:32 -0800 |
| commit | 6735701c1e70c7fb742f0343e1c264c0c27aca86 (patch) | |
| tree | d005eb1f1c4bc2a72e6441be4f42794e5552d2f5 | |
| parent | a2a1e8c2cbb944ee7b49928cfc3f00401a39b0fc (diff) | |
| parent | bf0b9bac8b10afccb5d98d4272ed1a311ed99042 (diff) | |
| download | nextcloud-server-6735701c1e70c7fb742f0343e1c264c0c27aca86.tar.gz nextcloud-server-6735701c1e70c7fb742f0343e1c264c0c27aca86.zip | |
Merge pull request #1837 from owncloud/fix-user-template
Remove unneeded code for user layout template
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | lib/template.php | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d0869cb8404..3bc1903876e 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -34,7 +34,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 0f9efe66496..ce55e58d28d 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); |