diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-08-11 23:31:57 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-08-11 23:31:57 +0000 |
| commit | 7922a663c08bafffc010c7700c1a5759abc4d443 (patch) | |
| tree | 6fe4863dfd5f43956247a1f4e2c8548a7f86f9e5 | |
| parent | 7063be3cae9b35ab42d0766ab29e53bf49f925a0 (diff) | |
* Support pagespec "functions" with no parameters, like included() in the
conditional plugin.
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 0af4a4fe9..d5a641526 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1041,7 +1041,7 @@ sub pagespec_translate ($) { #{{{ | \) # ) | - \w+\([^\)]+\) # command(params) + \w+\([^\)]*\) # command(params) | [^\s()]+ # any other text ) diff --git a/debian/changelog b/debian/changelog index 470a3ece5..c6725a4a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,10 @@ ikiwiki (2.6) UNRELEASED; urgency=low atom feeds, and also changing the publication time for a feed to the newest modiciation time (was newest creation time). * The patch also adds dcterms:creator to rss items that have a known author. + * Support pagespec "functions" with no parameters, like included() in the + conditional plugin. - -- Joey Hess <joeyh@debian.org> Sat, 11 Aug 2007 18:25:28 -0400 + -- Joey Hess <joeyh@debian.org> Sat, 11 Aug 2007 19:26:14 -0400 ikiwiki (2.5) unstable; urgency=low diff --git a/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn b/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn index b7379e7b4..a2eba694c 100644 --- a/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn +++ b/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn @@ -55,4 +55,10 @@ case the user is given to rebuilding the wiki by hand. --Ethan return IkiWiki::FailReason->new("syntax error") if $@; return $ret; } #}}} -</pre>
\ No newline at end of file +</pre> + +> Thanks, [[done]] --[[Joey]] +> +> Note that the printing of the error isn't needed though. pagespec_match() +> returns an IkiWiki::FailReason object if parsing fails, and its caller +> can use that as desired to print the error. |