X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4806913e18c9e860ea834e87e73eb5b083dd2efd..ee411e5154cedd644fe54ccb29d64b6d18cb9bde:/app/helpers/browse_helper.rb diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index a41b39a3d..de439d56f 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -4,7 +4,12 @@ module BrowseHelper end def printable_name(object, version=false) - name = t 'printable_name.with_id', :id => object.id.to_s + if object.id.is_a?(Array) + id = object.id[0] + else + id = object.id + end + name = t 'printable_name.with_id', :id => id.to_s if version name = t 'printable_name.with_version', :id => name, :version => object.version.to_s end @@ -73,7 +78,7 @@ private def wikipedia_link(key, value) # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL - return nil if value =~ /^http:\/\// + return nil if value =~ /^https?:\/\// if key == "wikipedia" # This regex should match Wikipedia language codes, everything