1 files changed, 6 insertions, 29 deletions

diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index 39ec495..cb13c8d 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -1,5 +1,5 @@
 module LinkHelper
-  
+
   def content_path_helper path_array
     url_for(
       :controller => :content,
@@ -8,11 +8,11 @@ module LinkHelper
       :page_path => path_array
     )
   end
-  
+
   def content_url_helper path_array
     request.protocol + request.host_with_port + content_path_helper(path_array)
   end
-  
+
   def link_to_path title, path, html_options = {}
     return "" if path.nil?
 
@@ -22,9 +22,7 @@ module LinkHelper
     end
 
     active_class = active ? {:class => 'active'} : {:class => 'inactive'}
-
     html_options = html_options.merge(active_class)
-
     locale = params[:locale] || I18n.locale
 
     link_to(
@@ -39,34 +37,13 @@ module LinkHelper
       return :class => "selected"
     end
   end
-  
+
   def unlock_link
     message = "Are you sure you want to unlock?\n" +
               "Locked by #{@node.lock_owner.login}\n" +
-              "Last modified #{@page.updated_at.to_s(:db)}"
-    
-    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
+              "Last modified #{@page.updated_at.to_fs(:db)}"
 
-  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
-    )
+    link_to 'Unlock', unlock_node_path(@node), :method => :put, :data => { :confirm => message }
   end
 
 end