2 files changed, 25 insertions, 6 deletions

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 389f6dcb..e5c3d5c8 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -1,11 +1,11 @@
 module AdminHelper
-  
+
   def language_selector
     case I18n.locale
     when :de
-      link_to raw('<span class="inactive">English</span>'), url_for(:overwrite_params => {:locale => :en})
+      link_to raw('<span class="inactive">English</span>'), url_for(params.permit!.to_h.merge('locale' => 'en'))
     when :en
-      link_to raw('<span class="inactive">Deutsch</span>'), url_for(:overwrite_params => {:locale => :de})
+      link_to raw('<span class="inactive">Deutsch</span>'), url_for(params.permit!.to_h.merge('locale' => 'de'))
     end
   end
 end
diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index 85d8fbe4..39ec4958 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -45,9 +45,28 @@ module LinkHelper
               "Locked by #{@node.lock_owner.login}\n" +
               "Last modified #{@page.updated_at.to_s(:db)}"
     
-    link_to(
-      'Unlock', unlock_node_path(@node), :method => :put, :data => { :confirm => message }
+    link_to 'Unlock', safe_path(:unlock_node_path, @node), :method => :put, :data => { :confirm => message }
+  end
+
+  # Rails 6.1 workaround: content_path named helper returns RouteWithParams
+  # when called from within a catch-all glob route request context.
+  # Rails 6.1 workaround: named route helpers return RouteWithParams when called
+  # from within a catch-all glob route request context.
+  # Remove this method when upgrading to Rails 7.0+, where this is fixed.
+  def safe_path(name, *args)
+    Rails.application.routes.url_helpers.send(name, *args)
+  end
+
+  def content_path(page_path = nil, options = {})
+    if page_path.is_a?(Hash)
+      options = page_path
+      page_path = options.delete(:page_path)
+    end
+    options[:locale] ||= params[:locale] || I18n.locale
+    Rails.application.routes.url_helpers.content_path(
+      Array(page_path).join("/").sub(/^\//, ""),
+      options
     )
   end
-  
+
 end