From: Bart Visscher Date: Thu, 7 Feb 2013 17:07:27 +0000 (+0100) Subject: Fix warning with displayname in user layout template X-Git-Tag: v5.0.0alpha1~84^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=20b6cb28b16fd663ea386fd6faf6c3129a97f42b;p=nextcloud-server.git Fix warning with displayname in user layout template --- 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 @@ - <?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getDisplayName()?' ('.OC_Util::sanitizeHTML(OC_User::getDisplayName()).') ':'' ?> + <?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?> diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 37ece91047f..28bdca6be0a 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -19,6 +19,7 @@ class OC_TemplateLayout extends OC_Template { } // Add navigation entry + $this->assign( 'application', '', false ); $navigation = OC_App::getNavigation(); $this->assign( 'navigation', $navigation, false); $this->assign( 'settingsnavigation', OC_App::getSettingsNavigation(), false); @@ -28,6 +29,8 @@ class OC_TemplateLayout extends OC_Template { break; } } + $user_displayname = OC_User::getDisplayName(); + $this->assign( 'user_displayname', $user_displayname ); } else if ($renderas == 'guest') { parent::__construct('core', 'layout.guest'); } else {