aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-11-29 14:59:48 -0400
committerJoey Hess <joey@kitenet.net>2010-11-29 14:59:48 -0400
commit53d466a07f542dca86732764ab4f13608d701a1c (patch)
treead7f6e692a66e36898efcc7cdcac5d5856197497
parentf60f15704e1f98ceea023561c9e411b6fc3ac4ea (diff)
downloadikiwiki-53d466a07f542dca86732764ab4f13608d701a1c.tar
ikiwiki-53d466a07f542dca86732764ab4f13608d701a1c.tar.gz
second parameter of urlto is optional
-rw-r--r--IkiWiki.pm2
-rw-r--r--doc/plugins/write.mdwn2
2 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index a893edb3b..97946bfcf 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1134,7 +1134,7 @@ sub beautify_urlpath ($) {
return $url;
}
-sub urlto ($$;$) {
+sub urlto ($;$$) {
my $to=shift;
my $from=shift;
my $absolute=shift;
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 726ace8d3..ccdf9f393 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -982,7 +982,7 @@ This is the standard gettext function, although slightly optimised.
This is the standard ngettext function, although slightly optimised.
-### `urlto($$;$)`
+### `urlto($;$$)`
Construct a relative url to the first parameter from the page named by the
second. The first parameter can be either a page name, or some other