Merge remote-tracking branch 'upstream/pull/2673'

[rails.git] / app / views / site / id.html.erb
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb

index a38a81534355d77e54684bee2f6df25eb1dce7de..39f75c8cac722abed2a1257d647267a94bcb9e65 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -2,15 +2,15 @@
  <html>
  <head>
    <meta charset='utf-8'>
-  <%= stylesheet_link_tag 'id' %>
+  <%= stylesheet_link_tag "id" %>
    <!--[if !IE || gte IE 9]><!-->
-  <%= javascript_include_tag 'id' %>
+  <%= javascript_include_tag "id" %>
    <!-- <![endif]-->
  </head>
  <body>
  <% data = {} -%>
-<% if defined? ID_KEY %>
-<% token = @user.access_token(ID_KEY) %>
+<% if Settings.key?(:id_key) %>
+<% token = current_user.access_token(Settings.id_key) %>
  <% data[:token] = token.token -%>
  <% data[:token_secret] = token.secret -%>
  <% data[:consumer_key] = token.client_application.key -%>
@@ -19,6 +19,6 @@
  <% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%>
  <% data[:locale_path] = asset_path("iD/locales/#{data[:locale]}.json") -%>
  <% data[:asset_map] = assets("iD").to_json -%>
-<%= content_tag :div, "", :id => "id-container", :data => data %>
+<%= tag.div "", :id => "id-container", :data => data %>
  </body>
  </html>