From: Joey Hess <joey@kitenet.net>
Date: Tue, 1 Mar 2011 16:39:08 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110321~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9d3467cf4ac8773589a90a9b28e1e726dc417e6d?hp=b156dbdcc25aa5f1e8124d0ae14d9aa75835b606

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7d1f5c401..9de25a4b3 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1168,7 +1168,7 @@ sub urlto ($;$$) {
 	}
 
 	if (! defined $from) {
-		my $u = $local_url;
+		my $u = $local_url || '';
 		$u =~ s{/$}{};
 		return $u.beautify_urlpath("/".$to);
 	}