mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1717 from owncloud/fix-warning-template 

Fix strict standard warning in user template
This commit is contained in:
icewind1991 2013-02-15 08:07:02 -08:00
parent cd310add23 b8e2454f68
commit 425d41aaf9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/layout.user.php
View File

@ -31,7 +31,7 @@
<ul id="settings" class="svg"> <ul id="settings" class="svg">
<span id="expand"> <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'); ?>" /> <img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
</span> </span>
<div id="expanddiv"> <div id="expanddiv">

2
lib/template.php
View File

@ -415,6 +415,8 @@ class OC_Template{
$page = new OC_TemplateLayout($this->renderas); $page = new OC_TemplateLayout($this->renderas);
if($this->renderas == 'user') { if($this->renderas == 'user') {
$page->assign('requesttoken', $this->vars['requesttoken']); $page->assign('requesttoken', $this->vars['requesttoken']);
$user = OC_User::getUser();
$page->assign('displayname', OCP\User::getDisplayName($user));
} }
// Add custom headers // Add custom headers