lib/scrivito/link_parser.rb in scrivito_sdk-1.5.5 vs lib/scrivito/link_parser.rb in scrivito_sdk-1.6.0.rc1

@@ -28,11 +28,11 @@
         end
 
         link_params[:url] = uri.to_s
       end
 
-      link_params[:query] = remove_editing_context_params(uri.query)
+      link_params[:query] = remove_editing_context_params(uri.query_values)
       link_params[:fragment] = uri.fragment
 
       Link.new(link_params)
     rescue Addressable::URI::InvalidURIError
       Link.new(url: url)
@@ -94,15 +94,15 @@
     def route(uri)
       Rails.application.routes.recognize_path(uri.to_s, method: :get)
     rescue ActionController::RoutingError
     end
 
-    def remove_editing_context_params(query)
-      if query
-        params = Rack::Utils.parse_nested_query(query)
-        params.delete('_scrivito_display_mode')
-        params.delete('_scrivito_workspace_id')
-        params.to_query
+    def remove_editing_context_params(query_values)
+      if query_values
+        query_values.delete('_scrivito_display_mode')
+        query_values.delete('_scrivito_workspace_id')
+        uri = Addressable::URI.new(query_values: query_values)
+        uri.query
       end
     end
   end
 end