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

[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..f8d0f5858cc7ab0dc3be3e9bade086b4cd32d69b 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -9,8 +9,8 @@
  </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 -%>