_header_area.html.erb in skylinecms-3.2.0

- old
+ new

@@ -1,12 +1,12 @@
 <div id="headerArea">
   <div id="header">
   	<img src="<%= Skyline::Configuration.skyline_logo %>" alt="" height="19"/>
 
     <div id="usernavigation">
-      <%= t(:logged_in_as, :user => current_user.display_name, :scope => [:authentication])  %>
-      (<%= link_to_remote t(:logout, :scope => [:authentication]), :url => skyline_authentication_path  ,:method => :delete  %>)
+      <%= t(:logged_in_as, :user => h(current_user.display_name), :scope => [:authentication]).html_safe  %>
+      (<%= link_to t(:logout, :scope => [:authentication]), :url => skyline_authentication_path, :method => :delete, :remote => true  %>)
     </div>
   </div>
 
   <div id="mainnavigation">
     
@@ -25,17 +25,17 @@
         </li>      
       <% end %>
       <li>
         <%= link_to t(:media_library, :scope => [:navigation,:mainnavigation]), skyline_media_dirs_path, :class => (current_menu_item == :media_library ? "active" : nil) %>
       </li>
-      <% if @current_user.allow?(:settings_update) || @current_user.allow?(:user_show) %>
+      <% if current_user.allow?(:settings_update) || current_user.allow?(:user_show) %>
         <li class="has-children">
           <span <%= 'class="active"' if current_menu_item == :admin %>><%= t(:admin, :scope => [:navigation,:mainnavigation]) %></span>
           <ul>
-            <% if @current_user.allow?(:settings_update) && Skyline::Content::Implementation.instance.has_settings? %>
+            <% if current_user.allow?(:settings_update) && Skyline::Content::Implementation.instance.has_settings? %>
               <li><%= link_to t(:settings, :scope => [:navigation,:mainnavigation]), skyline_settings_path %></li>
             <% end %>
-            <% if @current_user.allow?(:user_show) %>            
+            <% if current_user.allow?(:user_show) %>            
               <li><%= link_to t(:users, :scope => [:navigation,:mainnavigation]), skyline_users_path %></li>
             <% end %>
             <% plugin_hook :admin_submenu %>
           </ul>
         </li>
\ No newline at end of file