]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e969a78)
Fix warning with displayname in user layout template
authorBart Visscher <bartv@thisnet.nl>
Thu, 7 Feb 2013 17:07:27 +0000 (18:07 +0100)
committerBart Visscher <bartv@thisnet.nl>
Thu, 7 Feb 2013 17:07:27 +0000 (18:07 +0100)
core/templates/layout.user.php patch | blob | history
lib/templatelayout.php patch | blob | history

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2547278547fedc25080c7a00c42a897471a824d0..ecba54497c7420039af5ec2536f1a11afd18b2f0 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -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'); ?>" />
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 37ece91047f4b4c012a2116b1eb724307fe90ff3..28bdca6be0a541d9b6f02d109750450b2d7c8bcb 100644 (file)
--- 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 {
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server