[myexperiment-hackers] [3791] trunk/app/controllers/application_controller.rb: Fixed issue posting back to Galaxy URLs that have been escaped

[noreply]

Revision

3791

Author

fbacall

Date

2013-11-18 10:35:18 +0000 (Mon, 18 Nov 2013)

Log Message

Fixed issue posting back to Galaxy URLs that have been escaped

Modified Paths

• trunk/app/controllers/application_controller.rb

Diff

Modified: trunk/app/controllers/application_controller.rb (3790 => 3791)

--- trunk/app/controllers/application_controller.rb	2013-11-15 14:56:22 UTC (rev 3790)
+++ trunk/app/controllers/application_controller.rb	2013-11-18 10:35:18 UTC (rev 3791)
@@ -512,11 +512,11 @@
 
       if external_url_keys.size == 1
         external_url_key = external_url_keys.first
-        external_url = params[external_url_key]
+        external_url = CGI.unescape(params[external_url_key])
 
         if %w(http https).include?(URI.parse(external_url).scheme)
           session[:came_from] = external_url_key[0..-5] # Strip the _url part
-          session[:return_url] = CGI.unescape(external_url)
+          session[:return_url] = external_url
         else
           raise("Invalid return URL given for #{external_url_key}: \n\t#{external_url}")
         end