]> source.dussan.org Git - nextcloud-server.git/commitdiff
Avoid to display empty DisplayNames for menu and title
authorBrice Maron <brice@bmaron.net>
Sat, 2 Mar 2013 15:09:36 +0000 (16:09 +0100)
committerBrice Maron <brice@bmaron.net>
Sat, 2 Mar 2013 15:09:36 +0000 (16:09 +0100)
core/templates/layout.user.php
lib/templatelayout.php

index 2b53cc0ae5d3ae37b064176a03810b7055f4edb3..c823ee6b3ac44c426a078386fb127362d4c57215 100644 (file)
@@ -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">
index 3d824cdca8ff0cd2729fa456d9bd5006fb806cba..29f120a6041a532f09595b51b093c3dc53488b11 100644 (file)
@@ -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 {