]> git.openstreetmap.org Git - rails.git/blobdiff - app/helpers/application_helper.rb
Merge remote-tracking branch 'upstream/pull/2667'
[rails.git] / app / helpers / application_helper.rb
index 5f36e262b9d24677f2cff1497e0d967718b471fe..2c8b00c17460504ddb49319b6506992a25e2be20 100644 (file)
@@ -79,11 +79,11 @@ module ApplicationHelper
 
     data[:location] = session[:location] if session[:location]
 
-    if @oauth
-      data[:token] = @oauth.token
-      data[:token_secret] = @oauth.secret
-      data[:consumer_key] = @oauth.client_application.key
-      data[:consumer_secret] = @oauth.client_application.secret
+    if oauth_token
+      data[:token] = oauth_token.token
+      data[:token_secret] = oauth_token.secret
+      data[:consumer_key] = oauth_token.client_application.key
+      data[:consumer_secret] = oauth_token.client_application.secret
     end
 
     data