Merge branch 'master' into moderation

[rails.git] / app / views / site / edit.html.erb

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index 030775fe602dde0027f8e8f1f6c4ecfaf5bdb712..81095140ed8f1fbdf47a64fdd8330e880c9a1dda 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -3,15 +3,11 @@
     <p><%= t 'layouts.osm_offline' %></p>
   <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
     <p><%= t 'layouts.osm_read_only' %></p>
-  <% elsif !@user.data_public? %>
+  <% elsif !current_user.data_public? %>
     <p><%= t 'site.edit.not_public' %></p>
-    <p><%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
+    <p><%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public'}) %></p>
     <p><%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p>
   <% else %>
-    <% content_for :head do %>
-      <%= javascript_include_tag "edit" %>
-    <% end %>
-
     <%= render :partial => preferred_editor %>
   <% end %>
 <% end %>