summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorblizzz <blizzz@owncloud.com>2013-02-07 11:25:33 -0800
committerblizzz <blizzz@owncloud.com>2013-02-07 11:25:33 -0800
commitfc7230349b6028184b21b229ef5873ea8b7aa99a (patch)
tree90344d833273846b86ec4a92833ec81f199d8012 /core
parent07f504812c89f35cf3167fb38e581d6437ef9142 (diff)
parent20b6cb28b16fd663ea386fd6faf6c3129a97f42b (diff)
downloadnextcloud-server-fc7230349b6028184b21b229ef5873ea8b7aa99a.tar.gz
nextcloud-server-fc7230349b6028184b21b229ef5873ea8b7aa99a.zip
Merge pull request #1530 from owncloud/fix-warning-displayname-layout
Fix warning with displayname in user layout template
Diffstat (limited to 'core')
-rw-r--r--core/templates/layout.user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2547278547f..ecba54497c7 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getDisplayName()?' ('.OC_Util::sanitizeHTML(OC_User::getDisplayName()).') ':'' ?></title>
+ <title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="apple-itunes-app" content="app-id=543672169">
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />