[Rt-commit] rt branch, 4.0/loc-cleanups, updated. rt-4.0.1rc1-8-g6718719

[Shawn Moore]

The branch, 4.0/loc-cleanups has been updated
       via  67187192a6bcf3e773f22a33ad69a87614948538 (commit)
      from  4d23f98154da7d84e86ddd29980a5e4165461eb2 (commit)

Summary of changes:
 share/html/Elements/Tabs |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 67187192a6bcf3e773f22a33ad69a87614948538
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Mon May 23 17:46:41 2011 -0400

    Factor out the <span> of the "Logged in as [_1]"

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index d6c4388..e5b7755 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -381,10 +381,14 @@ my $build_admin_menu = sub {
 
 
 
-    my $about_me = Menu->child( 'preferences' => title =>
-                        loc( 'Logged in as <span class="current-user">[_1]</span>', $session{'CurrentUser'}->Name),
-                    escape_title => 0,
-                    sort_order   => 99
+    my $about_me = Menu->child(
+        'preferences' =>
+        title => loc( 'Logged in as [_1]',
+                '<span class="current-user">'
+                . $m->interp->apply_escapes($session{'CurrentUser'}->Name, 'h') .
+                '</span>'),
+        escape_title => 0,
+        sort_order   => 99
     );
 
 
@@ -727,10 +731,14 @@ my $build_selfservice_nav = sub {
     }
 
 
-    my $about_me = Menu->child( 'preferences' => title =>
-                        loc( 'Logged in as <span class="current-user">[_1]</span>', $session{'CurrentUser'}->Name),
-                    escape_title => 0,
-                    sort_order   => 99
+    my $about_me = Menu->child(
+        'preferences' =>
+        title => loc( 'Logged in as [_1]',
+                '<span class="current-user">'
+                . $m->interp->apply_escapes($session{'CurrentUser'}->Name, 'h') .
+                '</span>'),
+        escape_title => 0,
+        sort_order   => 99
     );
 
     if ( $session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => RT->System ) ) {

-----------------------------------------------------------------------