mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1530 from owncloud/fix-warning-displayname-layout 

Fix warning with displayname in user layout template
This commit is contained in:
blizzz 2013-02-07 11:25:33 -08:00
parent 07f504812c 20b6cb28b1
commit fc7230349b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/layout.user.php
View File

@ -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'); ?>" />

3
lib/templatelayout.php
View File

@ -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 {