Fix for multiple includes on the same page; ignoring leading/trailing whitespace in WikiLinks [both by dm1]

app/models/chunks/include.rb

@@ -9,7 +9,7 @@ require 'chunks/wiki'
 
 class Include < WikiChunk::WikiReference
 
-  INCLUDE_PATTERN = /\[\[!include(.*)\]\]\s*/i
+  INCLUDE_PATTERN = /\[\[!include\s+(.*?)\]\]\s*/i
   def self.pattern() INCLUDE_PATTERN end
 
 

app/models/chunks/wiki.rb

@@ -99,7 +99,7 @@ module WikiChunk
   class Link < WikiLink
     
     unless defined? WIKI_LINK
-      WIKI_LINK = /(":)?\[\[([^\]]+)\]\]/
+      WIKI_LINK = /(":)?\[\[\s*([^\]\s][^\]]+?)\s*\]\]/
       LINK_TYPE_SEPARATION = Regexp.new('^(.+):((file)|(pic))$', 0, 'utf-8')
       ALIAS_SEPARATION = Regexp.new('^(.+)\|(.+)$', 0, 'utf-8')
     end