From: Tom Hughes <tom@compton.nu>
Date: Sat, 10 Mar 2012 12:46:10 +0000 (+0000)
Subject: Fix layout selection to detect OAuth correctly
X-Git-Tag: live~5746
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a87540a5ddb4d4f7863472f5b2bb1f8d2f8b62c4?ds=sidebyside

Fix layout selection to detect OAuth correctly
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index d7b73c14e..0aeab63b3 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -718,7 +718,7 @@ private
   # Choose the layout to use. See
   # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts
   def choose_layout
-    oauth_url = url_for(:controller => :oauth, :action => :oauthorize, :only_path => true)
+    oauth_url = url_for(:controller => :oauth, :action => :authorize, :only_path => true)
 
     if [ 'api_details' ].include? action_name
       nil