Fix layout selection to detect OAuth correctly
authorTom Hughes <tom@compton.nu>
Sat, 10 Mar 2012 12:46:10 +0000 (12:46 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 10 Mar 2012 12:46:10 +0000 (12:46 +0000)
app/controllers/user_controller.rb

index d7b73c14e6aa0739dbf370b73bba7873f1523317..0aeab63b37f10db726a2a67d5f4a4620c96c9c0b 100644 (file)
@@ -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