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

Merge pull request #16888 from owncloud/feature/fix-titles 

fixing setting page titles
This commit is contained in:
Jan-Christoph Borchardt 2015-06-12 14:54:42 +02:00
parent da96cbbcd4 62286f00a1
commit bb0ea6336d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/templatelayout.php
View File

@ -94,17 +94,26 @@ class OC_TemplateLayout extends OC_Template {
}
// Add navigation entry
$this->assign( 'application', '', false );
$this->assign( 'application', '');
$this->assign( 'appid', $appId );
$navigation = OC_App::getNavigation();
$this->assign( 'navigation', $navigation);
$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation());
$settingsNavigation = OC_App::getSettingsNavigation();
$this->assign( 'settingsnavigation', $settingsNavigation);
foreach($navigation as $entry) {
if ($entry['active']) {
$this->assign( 'application', $entry['name'] );
break;
}
}
foreach($settingsNavigation as $entry) {
if ($entry['active']) {
$this->assign( 'application', $entry['name'] );
break;
}
}
$userDisplayName = OC_User::getDisplayName();
$this->assign('user_displayname', $userDisplayName);
$this->assign('user_uid', OC_User::getUser());