* Fix absolute url munging in rss generation to support https, ftp, etc urls

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 6ecdf0d38989bc34e503607ed493520a83373dc5..9a86aad0bfa4ad7bb8588abf984fc24032f4c349 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -100,7 +100,7 @@ sub get_inline_content ($$) { #{{{
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if ($type ne 'unknown') {
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if ($type ne 'unknown') {

-               return htmlize($type, linkify($page, $parentpage, readfile(srcfile($file))));
+               return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));

        }
        else {
                return "";
        }
        else {
                return "";


@@ -121,8 +121,8 @@ sub absolute_urls ($$) { #{{{
 
        $url=~s/[^\/]+$//;
        
 
        $url=~s/[^\/]+$//;
        

-       $content=~s/<a\s+href="(?!http:\/\/)([^"]+)"/<a href="$url$1"/ig;
-       $content=~s/<img\s+src="(?!http:\/\/)([^"]+)"/<img src="$url$1"/ig;
+       $content=~s/<a\s+href="(?![^:]+:\/\/)([^"]+)"/<a href="$url$1"/ig;
+       $content=~s/<img\s+src="(?![^:]+:\/\/)([^"]+)"/<img src="$url$1"/ig;

        return $content;
 } #}}}
 
        return $content;
 } #}}}