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

need to handle urls to images the same 

Also, simplified finding the url to the top of the site.
master
Joey Hess 2008-04-03 16:37:05 -04:00
parent c207086282
commit 04e7467807
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki/Plugin/inline.pm
View File

@ -389,18 +389,18 @@ sub absolute_urls ($$) { #{{{
my $url=$baseurl; my $url=$baseurl;
$url=~s/[^\/]+$//; $url=~s/[^\/]+$//;
# what is the non path part of the url? (need it for relative url's starting with / # what is the non path part of the url?
my $top_uri = URI->new($url); my $top_uri = URI->new($url);
$top_uri->path_query("/"); # reset the path $top_uri->path_query(""); # reset the path
my $urltop = $top_uri->as_string; my $urltop = $top_uri->as_string;
$urltop=~s/\/*$//;
$content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig; $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;
# Relative URL # relative to another wiki page
$content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)([^\/][^"]*)"/$1 href="$url$2"/mig; $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)([^\/][^"]*)"/$1 href="$url$2"/mig;
$content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)([^\/][^"]*)"/$1 src="$url$2"/mig;
# relative to the top of the site # relative to the top of the site
$content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)(\/[^"]*)"/$1 href="$urltop$2"/mig; $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)(\/[^"]*)"/$1 href="$urltop$2"/mig;
$content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)([^"]+)"/$1 src="$url$2"/mig; $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)(\/[^"]*)"/$1 src="$urltop$2"/mig;
return $content; return $content;
} #}}} } #}}}

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ ikiwiki (2.42) UNRELEASED; urgency=low
* aggregate: Correct a mistake in the code that dummy up a guid for feeds * aggregate: Correct a mistake in the code that dummy up a guid for feeds
lacking one. lacking one.
* inline: Correct handling of urls relative to baseurl in feeds.
-- Joey Hess <joeyh@debian.org> Thu, 03 Apr 2008 02:35:39 -0400 -- Joey Hess <joeyh@debian.org> Thu, 03 Apr 2008 02:35:39 -0400