headless git branches: unmangling patch

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0a788f35bd69411e4ee536903fd8acc7a8580452..f68797ae3b962bc7556308fffa0da5d644c46ca3 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1092,6 +1092,11 @@ sub cgiurl (@) {
                join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 }
 
+sub cgiurl_abs (@) {
+       eval q{use URI};
+       URI->new_abs(cgiurl(@_), $config{cgiurl});
+}
+
 sub baseurl (;$) {
        my $page=shift;
 
@@ -1156,7 +1161,7 @@ sub strftime_utf8 {
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8.
        # Note that this does not handle utf-8 in the format string.
-       $strftime_encoding = POSIX::setlocale(&POSIX::LC_TIME) =~ m#\.([^@]+)#
+       ($strftime_encoding) = POSIX::setlocale(&POSIX::LC_TIME) =~ m#\.([^@]+)#
                unless defined $strftime_encoding;
        $strftime_encoding
                ? Encode::decode($strftime_encoding, POSIX::strftime(@_))