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

Merge branch 'master' into tova

master
Joey Hess 2008-09-29 18:11:32 -04:00
parent a9d7c5453a 0d3878896f
commit 799bcbcd47
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/conditional.pm
View File

@ -33,8 +33,8 @@ sub preprocess_if (@) { #{{{
# An optimisation to avoid needless looping over every page
# and adding of dependencies for simple uses of some of the
# tests.
$params{test} =~ /^\s*\!?\s*(enabled|sourcepage|destpage|included)\((.*)\)\s*$/) {
add_depends($params{page}, "$params{test} and $params{page}");
$params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
add_depends($params{page}, "($params{test}) and $params{page}");
$result=pagespec_match($params{page}, $params{test},
location => $params{page},
sourcepage => $params{page},

6
doc/todo/softlinks.mdwn 100644
View File

@ -0,0 +1,6 @@
If I have a filesystem soft-link, e.g. "foo.mdwn" links to "bar.mdwn", it doesn't work.
The page "foo/" does not exist.
This is too bad, because sometimes it is convenient to have several different names for the same page.
Could softlinks be handled gracefully by ikiwiki?

14
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-09-29 17:12-0400\n"
"POT-Creation-Date: 2008-09-29 18:05-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"
@ -48,7 +48,7 @@ msgstr ""
msgid "You are banned."
msgstr ""
#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1153
#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1143
msgid "Error"
msgstr ""
@ -904,25 +904,25 @@ msgstr ""
msgid "refreshing wiki.."
msgstr ""
#: ../IkiWiki.pm:458
#: ../IkiWiki.pm:451
msgid "Must specify url to wiki with --url when using --cgi"
msgstr ""
#: ../IkiWiki.pm:504
#: ../IkiWiki.pm:497
msgid "cannot use multiple rcs plugins"
msgstr ""
#: ../IkiWiki.pm:533
#: ../IkiWiki.pm:526
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
#: ../IkiWiki.pm:1136
#: ../IkiWiki.pm:1126
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
#: ../IkiWiki.pm:1645
#: ../IkiWiki.pm:1635
msgid "yes"
msgstr ""