From: Tom Hughes Date: Sun, 3 Apr 2011 10:16:57 +0000 (+0100) Subject: Only show login/signup in slim mode when used from oauth X-Git-Tag: live~6798^2~79 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/097fb390b8db714deb1615aa82714fea9af5b339?hp=98f34e4534ba5ae9886fbcb13b6e88b2aaace96a Only show login/signup in slim mode when used from oauth --- diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index ed17c1e41..25dd18f92 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -503,7 +503,7 @@ private def choose_layout if [ 'api_details' ].include? action_name nil - elsif [ 'login', 'new', 'terms'].include? action_name + elsif params[:referer] == url_for(:controller => :oauth, :action => :oauthorize, :only_path => true) 'slim' else 'site'