diff options
| author | Simon McVittie <smcv@debian.org> | 2014-11-26 11:58:05 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2014-11-26 11:58:05 +0000 |
| commit | 6c51b764bca2981b8962d7fcfd78efa533291283 (patch) | |
| tree | 0d3cb6dee45983ea81309d0f45107878e1ca7f0c /IkiWiki | |
| parent | dc0744a423255c21a455446f9871ea42aca244fa (diff) | |
| parent | 22961f81ddf642b24e45fdf9707dff06e17742a7 (diff) | |
| download | ikiwiki-6c51b764bca2981b8962d7fcfd78efa533291283.tar ikiwiki-6c51b764bca2981b8962d7fcfd78efa533291283.tar.gz | |
Merge branch 'ready/html5'
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/CGI.pm | 6 | ||||
| -rw-r--r-- | IkiWiki/Plugin/mirrorlist.pm | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index f448db6ef..61af830f8 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -67,9 +67,6 @@ sub cgitemplate ($$$;@) { if (exists $params{page}) { $page=delete $params{page}; $params{forcebaseurl}=urlto($page); - if (! $config{html5}) { - $params{forcebaseurl}=urlabs($params{forcebaseurl}, $topurl); - } } run_hooks(pagetemplate => sub { shift->( @@ -81,9 +78,6 @@ sub cgitemplate ($$$;@) { templateactions($template, ""); my $baseurl = baseurl(); - if (! $config{html5}) { - $baseurl = urlabs($baseurl, $topurl), - } $template->param( dynamic => 1, diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm index b7e532485..5afd9ec1a 100644 --- a/IkiWiki/Plugin/mirrorlist.pm +++ b/IkiWiki/Plugin/mirrorlist.pm @@ -53,7 +53,7 @@ sub pagetemplate (@) { sub mirrorlist ($) { my $page=shift; - return ($config{html5} ? '<nav id="mirrorlist">' : '<div>'). + return ($config{html5} ? '<nav' : '<div').' id="mirrorlist">'. (keys %{$config{mirrorlist}} > 1 ? gettext("Mirrors") : gettext("Mirror")). ": ". join(", ", |