Fix mangling of wikipedia links

Bail out straight away if the tag value is a URL rather than waiting
until we have parsed the key as we may change the value in the process
of parsing the key.

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index d2c2b5807c97f6ee6494fec99dbfdc4240bd4f53..ff702aed11f7a0ac04a0d284c604b4d3f467c9d8 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -49,6 +49,9 @@ private
   end
 
   def wikipedia_link(key, value)
   end
 
   def wikipedia_link(key, value)

+    # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
+    return nil if value =~ /^http:\/\//
+

     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
       # from de to zh-classical
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
       # from de to zh-classical


@@ -68,9 +71,6 @@ private
       return nil
     end
 
       return nil
     end
 

-    # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
-    return nil if value =~ /^http:\/\//
-

     return {
       :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
       :title => value
     return {
       :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
       :title => value