From: John Goerzen <jgoerzen@complete.org>
Date: Sat, 15 Mar 2008 13:24:08 +0000 (+0000)
Subject: Further refine WikiCaps processing for Trac to eliminate problems in
X-Git-Tag: 0.7.0-RC1~48
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=888b254844092cc4b007fd6e40db719c6ed8dfc8;p=redmine.git

Further refine WikiCaps processing for Trac to eliminate problems in
some corner cases


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1258 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 51d85fe0f..f1d754109 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -217,8 +217,8 @@ namespace :redmine do
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:([^\s\]]+).*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
 
-	# Links to pages UsingJustCaps
-	text = text.gsub(/[^!]\b([A-Z][a-z]+[A-Z][a-zA-Z]+)/, ' [[\1]]')
+	# Links to pages UsingJustWikiCaps
+	text = text.gsub(/([^!]|^)(^| )([A-Z][a-z]+[A-Z][a-zA-Z]+)/, '\\1\\2[[\3]]')
 	# Normalize things that were supposed to not be links
 	# like !NotALink
 	text = text.gsub(/(^| )!([A-Z][A-Za-z]+)/, '\1\2')