* Fix display of escaped wikilinks containing anchors.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8f9bd990a02c48a26a249e36e3df245807dbedec..37ff792d124369f3804dedbc4c41be04e0b0a711 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -549,8 +549,14 @@ sub linkify ($$$) { #{{{
 
        $content =~ s{(\\?)$config{wiki_link_regexp}}{
                defined $2
 
        $content =~ s{(\\?)$config{wiki_link_regexp}}{
                defined $2

-                       ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, linkpage($3), anchor => $4, linktext => pagetitle($2)))
-                       : ( $1 ? "[[$3]]"    : htmllink($lpage, $page, linkpage($3), anchor => $4))
+                       ? ( $1 
+                               ? "[[$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;
        
        return $content;
        }eg;
        
        return $content;

diff --git a/debian/changelog b/debian/changelog
index a26394cd5db2cc20e736e6c612d27bbcafdda5fd..ac6af107578e1bf98af8a5301cde2145c611f810 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,8 +43,9 @@ ikiwiki (1.49) UNRELEASED; urgency=low
     flashing during page load.
   * Fix smiley plugin to scan smileys.mdwn after it's updated, which fixes
     a bug caused by committing changes to smilies.mdwn.
     flashing during page load.
   * Fix smiley plugin to scan smileys.mdwn after it's updated, which fixes
     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
 

diff --git a/doc/wikilink/discussion.mdwn b/doc/wikilink/discussion.mdwn
index 0bf33ade9b29aebb9c3833ff21881ca2fe11b3ed..3b6f042d3a99eac98797e3aa6728cbbff227a69d 100644 (file)
--- a/doc/wikilink/discussion.mdwn
+++ b/doc/wikilink/discussion.mdwn
@@ -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]]
 > definitely looks like a bug.  --[[JoshTriplett]]
 >
 > The lack of the `#foo` anchor in the anchor example on [[wikilink]]
 > definitely looks like a bug.  --[[JoshTriplett]]

+
+>> Fixed that --[[Joey]]

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index e12b524944315b34a5c8e4dd69b89e19acff046a..29db5e4d3df9af8be168357f4bdc919300906bc1 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -545,7 +545,7 @@ msgstr ""
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:614
+#: ../IkiWiki.pm:620

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""