diff options
| author | eMerzh <brice@bmaron.net> | 2013-03-02 07:42:11 -0800 |
|---|---|---|
| committer | eMerzh <brice@bmaron.net> | 2013-03-02 07:42:11 -0800 |
| commit | 37295deeb70f45bad188bf4eae81db51d19be8c2 (patch) | |
| tree | 93b1eafce448248f18dfd6f576cfdc97eafa411a | |
| parent | d3e88e6a8c715b13f06424ad97c284151f128353 (diff) | |
| parent | 050de008b1f648db4bb1381620a6d5ca3ab8583b (diff) | |
| download | nextcloud-server-37295deeb70f45bad188bf4eae81db51d19be8c2.tar.gz nextcloud-server-37295deeb70f45bad188bf4eae81db51d19be8c2.zip | |
Merge pull request #2031 from eMerzh/fix_empty_display_name
Avoid to display empty DisplayNames for menu and title
| -rw-r--r-- | core/templates/layout.user.php | 4 | ||||
| -rw-r--r-- | lib/templatelayout.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 2b53cc0ae5d..c823ee6b3ac 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -2,7 +2,7 @@ <html class="ng-csp"> <head> <title><?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud - <?php p(!empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'') ?></title> + <?php p(trim($_['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 print_unescaped(image_path('', 'favicon.png')); ?>" /> @@ -34,7 +34,7 @@ <ul id="settings" class="svg"> <span id="expand"> - <span id="expandDisplayName"><?php p($_['user_displayname']) ?></span> + <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /> </span> <div id="expanddiv"> diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 3d824cdca8f..29f120a6041 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -31,6 +31,7 @@ class OC_TemplateLayout extends OC_Template { } $user_displayname = OC_User::getDisplayName(); $this->assign( 'user_displayname', $user_displayname ); + $this->assign( 'user_uid', OC_User::getUser() ); } else if ($renderas == 'guest' || $renderas == 'error') { parent::__construct('core', 'layout.guest'); } else { |