X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/47e6637f180c9ffa3950ee9307f9667ffcfc2ee3..cca78f979060e6c8fd4ffcbf58a2e3361502aa99:/app/helpers/browse_helper.rb diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 76a6d5eb1..ef7b3f554 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -133,14 +133,14 @@ module BrowseHelper lang = if value =~ /^([a-z-]{2,12}):(.+)$/i # Value is : so split it up # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315 - $1 + Regexp.last_match(1) else # Value is <title> so default to English Wikipedia "en" end elsif key =~ /^wikipedia:(\S+)$/ # Language is in the key, so assume value is the title - lang = $1 + lang = Regexp.last_match(1) else # Not a wikipedia key! return nil @@ -149,9 +149,9 @@ module BrowseHelper if value =~ /^([^#]*)#(.*)/ # Contains a reference to a section of the wikipedia article # Must break it up to correctly build the url - value = $1 - section = "#" + $2 - encoded_section = "#" + URI.encode($2.gsub(/ +/, "_"), /[^A-Za-z0-9:_]/).tr("%", ".") + value = Regexp.last_match(1) + section = "#" + Regexp.last_match(2) + encoded_section = "#" + URI.encode(Regexp.last_match(2).gsub(/ +/, "_"), /[^A-Za-z0-9:_]/).tr("%", ".") else section = "" encoded_section = ""