Decorate current_user

app/controllers/application_controller.rb

@@ -10,14 +10,12 @@ class ApplicationController < ActionController::Base
   rescue_from Unauthorized, :with => :unauthorized
   rescue_from Forbidden, :with => :forbidden
 
-  helper_method :current_user, :current_user_decorated
+  helper_method :current_user
 
   def current_user
-    @current_user ||= User.find_by_id(session[:user_id]) if session[:user_id]
-  end
-
-  def current_user_decorated
-    @current_user_decorated ||= UserDecorator.new(current_user)
+    if session[:user_id]
+      @current_user ||= UserDecorator.find_by_id(session[:user_id])
+    end
   end
 
   def current_user=(user)

app/views/layouts/_session_info.html.erb

@@ -1,7 +1,7 @@
 <ul class="session-info">
   <% if current_user %>
     <li class="username">
-      <%= current_user_decorated.avatar_profile_link(:title => '') %>
+      <%= current_user.avatar_profile_link(:title => '') %>
       <%= link_to "~#{current_user.nickname}", profile_path(current_user) %>
 
       <ul class="menu">