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

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

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index 161bb2d6de57369c322c0e30ba5d50dc37c14850..882f2c8354eb73e2415371b54a8871d0b1359386 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -1,9 +1,9 @@
 module GeocoderHelper
   def result_to_html(result)
 module GeocoderHelper
   def result_to_html(result)

-    html_options = { :class => "set_position", :data => {} }
+    html_options = { :class => "set_position stretched-link", :data => {} }

 
     url = if result[:type] && result[:id]
 
     url = if result[:type] && result[:id]

-            url_for(:controller => :browse, :action => result[:type], :id => result[:id])
+            url_for(:controller => result[:type].pluralize, :action => :show, :id => result[:id])

           elsif result[:min_lon] && result[:min_lat] && result[:max_lon] && result[:max_lat]
             "/?bbox=#{result[:min_lon]},#{result[:min_lat]},#{result[:max_lon]},#{result[:max_lat]}"
           else
           elsif result[:min_lon] && result[:min_lat] && result[:max_lon] && result[:max_lat]
             "/?bbox=#{result[:min_lon]},#{result[:min_lat]},#{result[:max_lon]},#{result[:max_lat]}"
           else


@@ -14,13 +14,13 @@ module GeocoderHelper
       html_options[:data][key.to_s.tr("_", "-")] = value
     end
 
       html_options[:data][key.to_s.tr("_", "-")] = value
     end
 

-    html = ""
+    html = []

     html << result[:prefix] if result[:prefix]
     html << " " if result[:prefix] && result[:name]
     html << link_to(result[:name], url, html_options) if result[:name]
     html << " " if result[:suffix] && result[:name]
     html << result[:suffix] if result[:suffix]
     html << result[:prefix] if result[:prefix]
     html << " " if result[:prefix] && result[:name]
     html << link_to(result[:name], url, html_options) if result[:name]
     html << " " if result[:suffix] && result[:name]
     html << result[:suffix] if result[:suffix]

-    html.html_safe
+    safe_join(html)

   end
 
   def describe_location(lat, lon, zoom = nil, language = nil)
   end
 
   def describe_location(lat, lon, zoom = nil, language = nil)