urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename beautify_url to stress it only works on the path component

master
Joey Hess 2008-07-11 10:33:41 -04:00
parent 98bd33eee4
commit d73d4fed03
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki.pm
View File

@ -533,7 +533,7 @@ sub displaytime ($;$) { #{{{
return decode_utf8(POSIX::strftime($format, localtime($time)));
} #}}}
sub beautify_url ($) { #{{{
sub beautify_urlpath ($) { #{{{
my $url=shift;
if ($config{usedirs}) {
@ -554,7 +554,7 @@ sub urlto ($$) { #{{{
my $from=shift;
if (! length $to) {
return beautify_url(baseurl($from)."index.$config{htmlext}");
return beautify_urlpath(baseurl($from)."index.$config{htmlext}");
}
if (! $destsources{$to}) {
@ -563,7 +563,7 @@ sub urlto ($$) { #{{{
my $link = abs2rel($to, dirname(htmlpage($from)));
return beautify_url($link);
return beautify_urlpath($link);
} #}}}
sub htmllink ($$$;@) { #{{{
@ -610,7 +610,7 @@ sub htmllink ($$$;@) { #{{{
}
$bestlink=abs2rel($bestlink, dirname(htmlpage($page)));
$bestlink=beautify_url($bestlink);
$bestlink=beautify_urlpath($bestlink);
if (! $opts{noimageinline} && isinlinableimage($bestlink)) {
return "<img src=\"$bestlink\" alt=\"$linktext\" />";

2
IkiWiki/Plugin/recentchanges.pm
View File

@ -80,7 +80,7 @@ sub cgi ($) { #{{{
"</p>");
}
else {
IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_url("/".htmlpage($link)));
IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_urlpath("/".htmlpage($link)));
}
exit;