diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-26 22:09:55 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-26 22:09:55 +0000 |
| commit | 3a2cb0ecfff65f728569edbdcc4e30f027c36d67 (patch) | |
| tree | c1a219607907988667efed4fffce0774429d981e | |
| parent | 6880b3e5e46aea761b4bcf7a2f88c45ad618a221 (diff) | |
| download | ikiwiki-3a2cb0ecfff65f728569edbdcc4e30f027c36d67.tar ikiwiki-3a2cb0ecfff65f728569edbdcc4e30f027c36d67.tar.gz | |
* Fix CamelCase regexp to not break [[FooBar|BazBar]] WikiLinks.
| -rw-r--r-- | IkiWiki/Plugin/camelcase.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm index 0934b27c2..68d399d77 100644 --- a/IkiWiki/Plugin/camelcase.pm +++ b/IkiWiki/Plugin/camelcase.pm @@ -14,7 +14,7 @@ sub filter (@) { #{{{ # Make CamelCase links work by promoting them to fullfledged # WikiLinks. This regexp is based on the one in Text::WikiFormat. - $params{content}=~s#(?<![["/>=])\b((?:[A-Z][a-z0-9]\w*){2,})#[[$1]]#g; + $params{content}=~s#(?<![[|"/>=])\b((?:[A-Z][a-z0-9]\w*){2,})#[[$1]]#g; return $params{content}; } #}}} diff --git a/debian/changelog b/debian/changelog index aa139be64..2bacb206c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ -ikiwiki (1.10) UNRELEASED; urgency=low +ikiwiki (1.10) unstable; urgency=low * Run page through any relevant filters when generating a page preview. * Noticed a bug in the wikitext markup plugin -- it made CamelCase links the default throughout the wiki, not only on wikitext pages. Decided to call this a feature, and split the camelcase support out into a separate plugin that is independant of wikitext. + * Fix CamelCase regexp to not break [[FooBar|BazBar]] WikiLinks. - -- Joey Hess <joeyh@debian.org> Wed, 26 Jul 2006 17:44:25 -0400 + -- Joey Hess <joeyh@debian.org> Wed, 26 Jul 2006 18:06:35 -0400 ikiwiki (1.9) unstable; urgency=low |