From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Apr 2011 12:24:08 +0000 (+0100)
Subject: Improve recognition of OAuth referers for triggering of slim mode
X-Git-Tag: live~7240^2~56
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b77c6fe8ae31b582e68f3d58391176e43b523023

Improve recognition of OAuth referers for triggering of slim mode
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 649c0c907..72d60a307 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -501,9 +501,11 @@ 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)
+
     if [ 'api_details' ].include? action_name
       nil
-    elsif params[:referer] == url_for(:controller => :oauth, :action => :oauthorize, :only_path => true)
+    elsif params[:referer] and URI.parse(params[:referer]).path == oauth_url
       'slim'
     else
       'site'