Don't break when the user isn't logged in...

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index ecb977656fa890f97d9e249f92f0b1d0715b2e81..a41a80176d16fa02f26c4fd9ef2fbbfa77d30903 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -4,7 +4,7 @@
 </p>
 <% else %>
 <% content_for :greeting do %>
 </p>
 <% else %>
 <% content_for :greeting do %>

-<% if !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>

 <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>
 <% end %>
 <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>
 <% end %>

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 9f5088038393d6c5f0e705db94df12625e40d9e0..41b2b86f2f388a42b326ddd4ebdfbc13fc68b00c 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,5 +1,5 @@
 <% content_for :greeting do %>
 <% content_for :greeting do %>

-<% if !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>

 <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>
 <% end %>
 <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>
 <% end %>