headers

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e23f7b9036949fef04f840eb9a6d49f61d704bc7..08e1f2769b8b7ca3b526e04808cd171d7ba3a2b4 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -155,6 +155,7 @@ sub preprocess_inline (@) { #{{{
                $ret.=$linktemplate->output;
        }
        
+       require HTML::Template;
        my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
        if (! @params) {
                return sprintf(gettext("nonexistant template %s"), $params{template});
@@ -302,9 +303,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;
 } #}}}