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

* Support pagespec "functions" with no parameters, like included() in the 

conditional plugin.
master
joey 2007-08-11 23:31:57 +00:00
parent 7063be3cae
commit 7922a663c0
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki.pm
View File

@ -1041,7 +1041,7 @@ sub pagespec_translate ($) { #{{{
| |
\) # ) \) # )
| |
\w+\([^\)]+\) # command(params) \w+\([^\)]*\) # command(params)
| |
[^\s()]+ # any other text [^\s()]+ # any other text
) )

4
debian/changelog vendored
View File

@ -19,8 +19,10 @@ ikiwiki (2.6) UNRELEASED; urgency=low
atom feeds, and also changing the publication time for a feed to the atom feeds, and also changing the publication time for a feed to the
newest modiciation time (was newest creation time). newest modiciation time (was newest creation time).
* The patch also adds dcterms:creator to rss items that have a known author. * 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 ikiwiki (2.5) unstable; urgency=low

8
doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn
View File

@ -55,4 +55,10 @@ case the user is given to rebuilding the wiki by hand. --Ethan
return IkiWiki::FailReason->new("syntax error") if $@; return IkiWiki::FailReason->new("syntax error") if $@;
return $ret; return $ret;
} #}}} } #}}}
</pre> </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.