X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/72c3b81efb1079f8db070ac89e97e9b7bcedd61b..8480cdc48cf4c009437013ded29942e0147a457a:/IkiWiki/Plugin/inline.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index d68723dff..a85cd5d2f 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -121,6 +121,9 @@ sub sessioncgi ($$) { if ($q->param('do') eq 'blog') { my $page=titlepage(decode_utf8(scalar $q->param('title'))); $page=~s/(\/)/"__".ord($1)."__"/eg; # don't create subdirs + if (! length $page) { + error(gettext("please enter a page title")); + } # if the page already exists, munge it to be unique my $from=$q->param('from'); my $add=""; @@ -183,7 +186,7 @@ sub preprocess_inline (@) { my $feedonly=yesno($params{feedonly}); # Backwards compatibility - if (defined $params{show} && $params{show} =~ m/^\d+$/) { + if (defined $params{show} && $params{show} =~ m/^-?\d+$/) { $params{limit} = $params{show}; delete $params{show}; } @@ -613,7 +616,7 @@ sub absolute_urls ($$) { $v=$baseurl.$v; # anchor } elsif ($dv=~/^(?!\w+:)[^\/]/) { - $v=$url.$v; # relative url + $v=URI->new_abs($v, $url)->canonical; # relative url } elsif ($dv=~/^\//) { if (! defined $urltop) { @@ -725,6 +728,7 @@ sub genfeed ($$$$$@) { my $template=template_depends($feedtype."page.tmpl", $page, blind_cache => 1); $template->param( + wants_absolute_urls => 1, title => $feedtitle, wikiname => $config{wikiname}, pageurl => $url,