* Fix CamelCase regexp to not break [[FooBar|BazBar]] WikiLinks.

diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index 0934b27c27826e369a8a033c09ba891cefac0df5..68d399d77698bb5be52ba48cd3ddaab21bb5b964 100644 (file)
--- 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.
 
        # 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};
 } #}}}
 
        return $params{content};
 } #}}}

diff --git a/debian/changelog b/debian/changelog
index aa139be64d7c751ed23c82fb62b8f268a6b56c40..2bacb206c915c656a5ccd5a88b991203d5daa883 100644 (file)
--- 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.
 
   * 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
 
 
 ikiwiki (1.9) unstable; urgency=low