Merge branch 'master' into openstreetbugs

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 9a49abd679c015f4c3a02259e9b9a2ac849f549d..de439d56fc6700a0c0973b9ad88bd3759b6d2aa9 100644 (file)
--- 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
@@ -42,14 +47,6 @@ module BrowseHelper
     end
   end
 
-  def note_author(object)
-    if object.author.nil?
-      h(object.author_name)
-    else
-      link_to h(object.author_name), :controller => "user", :action => "view", :display_name => object.author_name
-    end
-  end
-
 private
 
   ICON_TAGS = [ 
@@ -81,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