Only show login/signup in slim mode when used from oauth

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index ed17c1e41ea04e32f32c7e47fe235bce83637659..25dd18f9223b905493baf91b50b1f5ecfd5568e3 100644 (file)
--- 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'