Add rel=nofollow to links in tags. Closes #2555.

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e10650ada1fa3cde95956725f5e679f146446156..d805e27adee83bfe8518ec846b943940e5fd7dbb 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,10 @@
 module ApplicationHelper
   def htmlize(text)
-    return auto_link(sanitize(simple_format(text)), :link => :urls, :html => { :rel => "nofollow" })
+    return linkify(sanitize(simple_format(text)))
+  end
+
+  def linkify(text)
+    return auto_link(text, :link => :urls, :html => { :rel => "nofollow" })
   end
 
   def html_escape_unicode(text)

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 0c486e0a716c789d94116e44282d52689d7294f0..b6960b9c4b0b3533aad31d27d008e9ade1a5907c 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -23,7 +23,7 @@
 <% if common_details.changeset.tags['comment'] %>
   <tr>
     <th><%= t 'browse.common_details.changeset_comment' %></th>
-    <td><%= auto_link(h(common_details.changeset.tags['comment'])) %></td>
+    <td><%= linkify(h(common_details.changeset.tags['comment'])) %></td>
   </tr>
 <% end %>
 

diff --git a/app/views/browse/_tag.html.erb b/app/views/browse/_tag.html.erb
index 5724b064611c396db2c38ccd6bef22b00155b9e5..ab5707f9e0d82b572c408121a6b993f02e245be9 100644 (file)
--- a/app/views/browse/_tag.html.erb
+++ b/app/views/browse/_tag.html.erb
@@ -1,3 +1,3 @@
 <tr>
-  <td><%= h(tag[0]) %> = <%= auto_link(h(tag[1])) %></td>
+  <td><%= h(tag[0]) %> = <%= linkify(h(tag[1])) %></td>
 </tr> 

diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index 650030688eb82d431faf084cc47f5e1063a94243..cbcfe74702079bf968b1512f1e699928ad9754f7 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -28,7 +28,7 @@
     
   <td class="<%= cl %> comment">
     <% if changeset.tags['comment'] %>
-      <%= auto_link(h(changeset.tags['comment'])) %>
+      <%= linkify(h(changeset.tags['comment'])) %>
     <% else %>
       <%= t'changeset.changeset.no_comment' %>
     <% end %>
@@ -37,20 +37,18 @@
   <td class="<%= cl %> area">
     <% if changeset.min_lat.nil? %>
       <%= t'changeset.changeset.no_edits' %>
-    <% else 
-      minlon = changeset.min_lon/GeoRecord::SCALE.to_f
-      minlat = changeset.min_lat/GeoRecord::SCALE.to_f
-      maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
-      maxlat = changeset.max_lat/GeoRecord::SCALE.to_f
-    %>
+    <% else %>
+      <%
+        minlon = changeset.min_lon/GeoRecord::SCALE.to_f
+        minlat = changeset.min_lat/GeoRecord::SCALE.to_f
+        maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
+        maxlat = changeset.max_lat/GeoRecord::SCALE.to_f
+      %>
       <a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='<%= t'changeset.changeset.show_area_box' %>'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>
       <!--<%=changeset.area%>-->
-    <%   if changeset.area > 1500000000000 %>
-      <%= t'changeset.changeset.big_area' %>
-    <%
-         end
-       end
-    %>
+      <% if changeset.area > 1500000000000 %>
+        <%= t'changeset.changeset.big_area' %>
+      <% end %>
+    <% end %>
   </td>
-
 </tr>