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

fixing setting page titles

This commit is contained in:
Clark Tomlinson 2015-06-11 11:39:34 -04:00
parent cda9685c0e
commit 62286f00a1
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 // Add navigation entry
$this->assign( 'application', '', false );
$this->assign( 'application', '');
$this->assign( 'appid', $appId ); $this->assign( 'appid', $appId );
$navigation = OC_App::getNavigation(); $navigation = OC_App::getNavigation();
$this->assign( 'navigation', $navigation); $this->assign( 'navigation', $navigation);
$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation()); $settingsNavigation = OC_App::getSettingsNavigation();
$this->assign( 'settingsnavigation', $settingsNavigation);
foreach($navigation as $entry) { foreach($navigation as $entry) {
if ($entry['active']) { if ($entry['active']) {
$this->assign( 'application', $entry['name'] ); $this->assign( 'application', $entry['name'] );
break; break;
} }
} }
foreach($settingsNavigation as $entry) {
if ($entry['active']) {
$this->assign( 'application', $entry['name'] );
break;
}
}
$userDisplayName = OC_User::getDisplayName(); $userDisplayName = OC_User::getDisplayName();
$this->assign('user_displayname', $userDisplayName); $this->assign('user_displayname', $userDisplayName);
$this->assign('user_uid', OC_User::getUser()); $this->assign('user_uid', OC_User::getUser());