diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-12 00:32:38 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-12 00:32:38 +0100 |
| commit | 76b31f870cf78aa8882761d954554fecb92e6211 (patch) | |
| tree | 9c89430fe00983e94cc8864a12cd05242741d4c3 /lib/templatelayout.php | |
| parent | 0c31c3cc3a928e8ca9272d32d68163c0700697ea (diff) | |
| parent | fb23ac3ce2e0b3f002f036e55e516b672f088dc0 (diff) | |
| download | nextcloud-server-76b31f870cf78aa8882761d954554fecb92e6211.tar.gz nextcloud-server-76b31f870cf78aa8882761d954554fecb92e6211.zip | |
Merge branch 'master' into master-sqlserver
Diffstat (limited to 'lib/templatelayout.php')
| -rw-r--r-- | lib/templatelayout.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 37ece91047f..345f540af04 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 { @@ -36,6 +39,9 @@ class OC_TemplateLayout extends OC_Template { // Add the js files $jsfiles = self::findJavascriptFiles(OC_Util::$scripts); $this->assign('jsfiles', array(), false); + if (OC_Config::getValue('installed', false)) { + $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config')); + } if (!empty(OC_Util::$core_scripts)) { $this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false)); } |