* Make the url absolution code for feeds significantly more robust.

[ikiwiki.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 417eec8f3c93721af1dbecc8504de400bb8039c7..67aaa817e5b1832045e3a0fbac7c517beb5ad12f 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::inline;
 
 use warnings;
 use strict;
-use IkiWiki 1.00;
+use IkiWiki 2.00;
 use URI;
 
 sub import { #{{{
@@ -88,7 +88,7 @@ sub preprocess_inline (@) { #{{{
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};
-               if (pagespec_match($page, $params{pages}, $params{page})) {
+               if (pagespec_match($page, $params{pages}, location => $params{page})) {
                        push @list, $page;
                }
        }
@@ -212,7 +212,7 @@ sub preprocess_inline (@) { #{{{
                                $ret.="\n".
                                      linkify($page, $params{page},
                                      preprocess($page, $params{page},
-                                     filter($page,
+                                     filter($page, $params{page},
                                      readfile(srcfile($file)))));
                        }
                }
@@ -223,7 +223,7 @@ sub preprocess_inline (@) { #{{{
                        @list=@list[0..$params{feedshow} - 1];
                }
                if (exists $params{feedpages}) {
-                       @list=grep { pagespec_match($_, $params{feedpages}, $params{page}) } @list;
+                       @list=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @list;
                }
        
                if ($rss) {
@@ -266,7 +266,7 @@ sub get_inline_content ($$) { #{{{
                return htmlize($page, $type,
                       linkify($page, $destpage,
                       preprocess($page, $destpage,
-                      filter($page,
+                      filter($page, $destpage,
                       readfile(srcfile($file))))));
        }
        else {
@@ -302,9 +302,9 @@ sub absolute_urls ($$) { #{{{
        my $url=$baseurl;
        $url=~s/[^\/]+$//;
        
-       $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(#[^"]+)"/$1 href="$baseurl$2"/ig;
-       $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(?!\w+:\/\/)([^"]+)"/$1 href="$url$2"/ig;
-       $content=~s/(<img(?:\s+(?:class|id)="?\w+"?)?)\s+src="(?!\w+:\/\/)([^"]+)"/$1 src="$url$2"/ig;
+       $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*"(?!\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;
        return $content;
 } #}}}
 
@@ -333,7 +333,7 @@ sub genfeed ($$$$@) { #{{{
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
 
                $itemtemplate->param(
-                       title => pagetitle(basename($p), 1),
+                       title => pagetitle(basename($p)),
                        url => $u,
                        permalink => $u,
                        date_822 => date_822($pagectime{$p}),
@@ -377,7 +377,7 @@ sub genfeed ($$$$@) { #{{{
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);
        $template->param(
-               title => $page ne "index" ? pagetitle($page, 1) : $config{wikiname},
+               title => $page ne "index" ? pagetitle($page) : $config{wikiname},
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,