@@ -8,11 +8,12 @@ end class String def wiki_linked - self.gsub!(/\b((?:[A-Z]\w+){2,})/) { |m| "<a href=\"/#{m}\">#{m}</a>" } - self.gsub!(/\[(\w+){2,}\]/) { |m| + self.gsub!(/(?!<nowiki>)(?>\b((?:[A-Z]\w+){2,}))(?!<\/nowiki>)/) { |m| "<a href=\"/#{m}\">#{m}</a>" } + self.gsub!(/\[(\w+){2,}\]/) { |m| m.gsub!(/(\[|\])/, '') - "<a href=\"/#{m}\">#{m}</a>" + "<a href=\"/#{m}\">#{m}</a>" } + self.gsub!(/<\/?nowiki>/,'') self end end extensions.rb @@ -13,7 +13,7 @@ class Page end def body - @body ||= RubyPants.new(RedCloth.new(raw_body).to_html).to_html.wiki_linked + @body ||= RubyPants.new(RedCloth.new(raw_body.wiki_linked).to_html).to_html end def branch_name page.rb d2812a75c624974de773205dc960b0f45d86bcaf Jesse Newland jnewland@gmail.com http://github.com/schacon/git-wiki/commit/98d94cda6e9a5d0a46605ecf25e272273244e6db 98d94cda6e9a5d0a46605ecf25e272273244e6db 2009-10-27T18:13:39-07:00 2008-05-16T08:09:15-07:00 <nowiki/> support c499c450dd090a88d187d0abb221da21485a0297 Scott Chacon schacon@gmail.com