Only treat a user as logged in if the user object has an id value - this

avoids problem when creating an account fails and leaves an unsaved user
object with no id value.

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 54b7af10c532c8021afaa3f5e682e1431c867716..4194e14f785313518a6f727f8e189016856f55ff 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -24,7 +24,7 @@
     </div>
 
     <span id="greeting">
     </div>
 
     <span id="greeting">

-      <% if @user %>
+      <% if @user and @user.id %>

         Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | 
         <% @inbox_weight = 'bold' if @user.get_new_messages.length > 0 %>
         <%= link_to "inbox (#{@user.get_new_messages.length})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
         Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | 
         <% @inbox_weight = 'bold' if @user.get_new_messages.length > 0 %>
         <%= link_to "inbox (#{@user.get_new_messages.length})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |