From b8e2454f68f745141ff4d302413f28e3f03e95e4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Feb 2013 16:10:06 +0100
Subject: [PATCH] Fix strict standard warning in user template
---
core/templates/layout.user.php | 2 +-
lib/template.php | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 0d2a9f5d34..2d00bdb5c8 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 OCP\User::getDisplayName($user=null)?OC_Util::sanitizeHTML(OCP\User::getDisplayName($user=null)):(OC_User::getUser()?OC_User::getUser():'') ?>
+ <?php echo $_['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 0230d2f934..3df5a24f94 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -415,6 +415,8 @@ class OC_Template{
$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
--
GitLab