From: http://jmtd.livejournal.com/ Date: Fri, 2 Oct 2009 13:11:11 +0000 (-0400) Subject: remove some unintended wikilinks X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/d902444875abfe77811e3ef488535a82bb5e579b?ds=sidebyside remove some unintended wikilinks --- diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index b3fe9f86c..e2eb56d47 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -286,7 +286,7 @@ Mediawiki.pm - A plugin which supports mediawiki format. } - # Called to handle bookmarks like [[#heading]] or ?#a + # Called to handle bookmarks like \[[#heading]] or ?#a sub generate_fragment_link { my $url = shift; @@ -316,10 +316,10 @@ Mediawiki.pm - A plugin which supports mediawiki format. # Ikiwiki's link link plugin wrecks this line when displaying on the site. # Until the code highlighter plugin can turn off link finding, - # always escape double brackets in double quotes: [[ + # always escape double brackets in double quotes: \[[ if($inlink eq '..') { - # Mediawiki doesn't touch links like [[..#hi|ho]]. - return "[[" . $inlink . ($anchor?"#$anchor":"") . + # Mediawiki doesn't touch links like \[[..#hi|ho]]. + return "\[[" . $inlink . ($anchor?"#$anchor":"") . ($title?"|$title":"") . "]]" . $trailing; } @@ -380,7 +380,7 @@ Mediawiki.pm - A plugin which supports mediawiki format. add_depends($page, $redir_page); my $link=bestlink($page, underscorize(translate_path($page,$redir_page))); if (! length $link) { - return "Redirect Error: [[$redir_page]] not found."; + return "Redirect Error: \[[$redir_page]] not found."; } $value=urlto($link, $page); @@ -393,7 +393,7 @@ Mediawiki.pm - A plugin which supports mediawiki format. my %seen; while (exists $pagestate{$at}{mediawiki}{redir}) { if ($seen{$at}) { - return "Redirect Error: cycle found on [[$at]]"; + return "Redirect Error: cycle found on \[[$at]]"; } $seen{$at}=1; $at=$pagestate{$at}{mediawiki}{redir};