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

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index faf538fa926917dc429136d1a960eebd4ba7e13e..bb09f3a49953bd66ec26fcb8734befb800c767e1 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -58,13 +58,7 @@ module ApplicationHelper
     end
 
     data[:location] = session[:location] if session[:location]
-
-    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[:oauth_token] = oauth_token.token if oauth_token
 
     data
   end
@@ -77,5 +71,7 @@ module ApplicationHelper
     else
       flash
     end
+  rescue StandardError
+    flash.inspect if Rails.env.development?
   end
 end