urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix display of escaped wikilinks containing anchors.

master
joey 2007-04-06 21:20:14 +00:00
parent b49f8c13ee
commit 4de163b997
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki.pm
View File

@ -549,8 +549,14 @@ sub linkify ($$$) { #{{{
$content =~ s{(\\?)$config{wiki_link_regexp}}{ $content =~ s{(\\?)$config{wiki_link_regexp}}{
defined $2 defined $2
? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, linkpage($3), anchor => $4, linktext => pagetitle($2))) ? ( $1
: ( $1 ? "[[$3]]" : htmllink($lpage, $page, linkpage($3), anchor => $4)) ? "[[$2|$3".(length $4 ? "#$4" : "")."]]"
: htmllink($lpage, $page, linkpage($3),
anchor => $4, linktext => pagetitle($2)))
: ( $1
? "[[$3".(length $4 ? "#$4" : "")."]]"
: htmllink($lpage, $page, linkpage($3),
anchor => $4))
}eg; }eg;
return $content; return $content;

3
debian/changelog vendored
View File

@ -43,8 +43,9 @@ ikiwiki (1.49) UNRELEASED; urgency=low
flashing during page load. flashing during page load.
* Fix smiley plugin to scan smileys.mdwn after it's updated, which fixes * Fix smiley plugin to scan smileys.mdwn after it's updated, which fixes
a bug caused by committing changes to smilies.mdwn. a bug caused by committing changes to smilies.mdwn.
* Fix display of escaped wikilinks containing anchors.
-- Joey Hess <joeyh@debian.org> Fri, 06 Apr 2007 16:32:09 -0400 -- Joey Hess <joeyh@debian.org> Fri, 06 Apr 2007 17:17:52 -0400
ikiwiki (1.48) unstable; urgency=low ikiwiki (1.48) unstable; urgency=low

2
doc/wikilink/discussion.mdwn
View File

@ -18,3 +18,5 @@ BTW, ikiwiki doesn't displays the #foo anchor in the example
> >
> The lack of the `#foo` anchor in the anchor example on [[wikilink]] > The lack of the `#foo` anchor in the anchor example on [[wikilink]]
> definitely looks like a bug. --[[JoshTriplett]] > definitely looks like a bug. --[[JoshTriplett]]
>> Fixed that --[[Joey]]

4
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-04-06 16:36-0400\n" "POT-Creation-Date: 2007-04-06 17:19-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -545,7 +545,7 @@ msgstr ""
#. translators: preprocessor directive name, #. translators: preprocessor directive name,
#. translators: the second a page name, the #. translators: the second a page name, the
#. translators: third a number. #. translators: third a number.
#: ../IkiWiki.pm:614 #: ../IkiWiki.pm:620
#, perl-format #, perl-format
msgid "%s preprocessing loop detected on %s at depth %i" msgid "%s preprocessing loop detected on %s at depth %i"
msgstr "" msgstr ""