diff options
author | http://jmtd.livejournal.com/ <http://jmtd.livejournal.com/@web> | 2009-10-02 09:11:11 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2009-10-02 09:11:11 -0400 |
commit | d902444875abfe77811e3ef488535a82bb5e579b (patch) | |
tree | 9652d1419f5501853d3d5e0c268fd4fa5abd8dc8 | |
parent | e29950ded621525bef0d2981b8d3cad4ea395cf1 (diff) | |
download | ikiwiki-d902444875abfe77811e3ef488535a82bb5e579b.tar ikiwiki-d902444875abfe77811e3ef488535a82bb5e579b.tar.gz |
remove some unintended wikilinks
-rw-r--r-- | doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 12 |
1 files changed, 6 insertions, 6 deletions
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 <span class="createlink"><a href="http://u32.net/cgi-bin/ikiwiki.cgi?page=%20text%20&from=Mediawiki_Plugin%2Fmediawiki&do=create" rel="nofollow">?</a>#a</span> + # Called to handle bookmarks like \[[#heading]] or <span class="createlink"><a href="http://u32.net/cgi-bin/ikiwiki.cgi?page=%20text%20&from=Mediawiki_Plugin%2Fmediawiki&do=create" rel="nofollow">?</a>#a</span> 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 "<b>Redirect Error:</b> <nowiki>[[$redir_page]] not found.</nowiki>"; + return "<b>Redirect Error:</b> <nowiki>\[[$redir_page]] not found.</nowiki>"; } $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 "<b>Redirect Error:</b> cycle found on <nowiki>[[$at]]</nowiki>"; + return "<b>Redirect Error:</b> cycle found on <nowiki>\[[$at]]</nowiki>"; } $seen{$at}=1; $at=$pagestate{$at}{mediawiki}{redir}; |