diff options
| author | blizzz <blizzz@owncloud.com> | 2013-02-07 11:25:33 -0800 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2013-02-07 11:25:33 -0800 |
| commit | fc7230349b6028184b21b229ef5873ea8b7aa99a (patch) | |
| tree | 90344d833273846b86ec4a92833ec81f199d8012 /lib | |
| parent | 07f504812c89f35cf3167fb38e581d6437ef9142 (diff) | |
| parent | 20b6cb28b16fd663ea386fd6faf6c3129a97f42b (diff) | |
| download | nextcloud-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 'lib')
| -rw-r--r-- | lib/templatelayout.php | 3 |
1 files changed, 3 insertions, 0 deletions
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 { |