X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3697a684df0f9bf931fafb3cd7766753b47c1970..4ca0eb27437259d3daa64d883cd00b804d33c40a:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 97946bfcf..93d2c326d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -544,7 +544,7 @@ sub checkconfig () {
 		error(gettext("Must specify url to wiki with --url when using --cgi"));
 	}
 
-	if (length $config{url}) {
+	if (defined $config{url} && length $config{url}) {
 		eval q{use URI};
 		my $baseurl = URI->new($config{url});
 
@@ -1891,6 +1891,7 @@ sub template_depends ($$;@) {
 		},
 		loop_context_vars => 1,
 		die_on_bad_params => 0,
+		parent_global_vars => 1,
 		filename => $filename,
 		@_,
 		($untrusted ? (no_includes => 1) : ()),