Merge remote-tracking branch 'upstream/pull/3300'

[rails.git] / app / helpers / trace_helper.rb

diff --git a/app/helpers/trace_helper.rb b/app/helpers/trace_helper.rb
index e5397b0de244528212e8e38b34c7e59c7ae70156..aec1146cb8da9c68fd100364be0b7a626a98ecd5 100644 (file)
--- a/app/helpers/trace_helper.rb
+++ b/app/helpers/trace_helper.rb
@@ -1,17 +1,5 @@
 module TraceHelper
   def link_to_tag(tag)
 module TraceHelper
   def link_to_tag(tag)

-    if @action == "mine"
-      return link_to(tag, :tag => tag, :page => nil)
-    else
-      return link_to(tag, :tag => tag, :display_name => @display_name, :page => nil)
-    end
-  end
-
-  def link_to_page(page)
-    if @action == "mine"
-      return link_to(page, :tag => @tag, :page => page)
-    else
-      return link_to(page, :tag => @tag, :display_name => @display_name, :page => page)
-    end
+    link_to(tag, :tag => tag, :page => nil)

   end
 end
   end
 end