Add rel=nofollow to links to tagless nodes in browse pages

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index a2d0e440ddbd9700667544f60b9a46fb32e5c4cf..6c9e108dcb7c20860e5540fcf47f67d6a9fe9fad 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -52,6 +52,10 @@ module BrowseHelper
     end
   end
 
+  def link_follow(object)
+    "nofollow" if object.tags.empty?
+  end
+
   def format_key(key)
     if url = wiki_link("key", key)
       link_to h(key), url, :title => t("browse.tag_details.wiki_link.key", :key => key)
@@ -122,7 +126,7 @@ module BrowseHelper
       if value =~ /^([a-z-]{2,12}):(.+)$/i
         # Value is <lang>:<title> so split it up
         # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315
-        lang  = $1
+        lang = $1
       else
         # Value is <title> so default to English Wikipedia
         lang = "en"
@@ -140,7 +144,7 @@ module BrowseHelper
       # Must break it up to correctly build the url
       value = $1
       section = "#" + $2
-      encoded_section = "#" + URI.encode($2.gsub(" ", "_")).gsub("%3A", ":").gsub("%", ".")
+      encoded_section = "#" + URI.encode($2.gsub(/ +/, "_"), /[^A-Za-z0-9:_]/).tr("%", ".")
     else
       section = ""
       encoded_section = ""