0
@@ -8,11 +8,12 @@ end
0
 
0
 class String
0
   def wiki_linked
0
-    self.gsub!(/\b((?:[A-Z]\w+){2,})/) { |m| "<a href=\"/#{m}\">#{m}</a>" }
0
-    self.gsub!(/\[(\w+){2,}\]/) { |m| 
0
+    self.gsub!(/(?!<nowiki>)(?>\b((?:[A-Z]\w+){2,}))(?!<\/nowiki>)/) { |m| "<a href=\"/#{m}\">#{m}</a>" }
0
+    self.gsub!(/\[(\w+){2,}\]/) { |m|
0
       m.gsub!(/(\[|\])/, '')
0
-      "<a href=\"/#{m}\">#{m}</a>" 
0
+      "<a href=\"/#{m}\">#{m}</a>"
0
     }
0
+    self.gsub!(/<\/?nowiki>/,'')
0
     self
0
   end
0
 end

0
@@ -13,7 +13,7 @@ class Page
0
   end
0
 
0
   def body
0
-    @body ||= RubyPants.new(RedCloth.new(raw_body).to_html).to_html.wiki_linked
0
+    @body ||= RubyPants.new(RedCloth.new(raw_body.wiki_linked).to_html).to_html
0
   end
0
   
0
   def branch_name