* inline: When forcing urls absolute for rss feeds, skip mailto and other

  such urls.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index b43530eb8dc57a198898ad670e1a94ad428c8b42..f4a20e48967954910f2fd19d281146c1ec379e04 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -362,8 +362,8 @@ sub absolute_urls ($$) { #{{{
        $url=~s/[^\/]+$//;
        
        $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;
        $url=~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*"(?!\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;
+       $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;
 } #}}}
 
        return $content;
 } #}}}
 

diff --git a/debian/changelog b/debian/changelog
index f0ca4c75459945cf39498ba3ce9cfe82a9d3a9fe..73c872434d154a3921e55052ff45b9bbd03c6b1c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,8 @@ ikiwiki (2.40) UNRELEASED; urgency=low
   * Disable taint checking for all builds as people keep complaining about it,
     and since all versions of perl seem to be hopelessly broken.
   * Fix links generated by preprocessor directives when previewing.
   * Disable taint checking for all builds as people keep complaining about it,
     and since all versions of perl seem to be hopelessly broken.
   * Fix links generated by preprocessor directives when previewing.

+  * inline: When forcing urls absolute for rss feeds, skip mailto and other
+    such urls.

 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 
 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 

diff --git a/doc/bugs/mailto:_links_not_properly_generated_in_rssatom_feeds.mdwn b/doc/bugs/mailto:_links_not_properly_generated_in_rssatom_feeds.mdwn
index b2144cad4c6f173bae8220ed81361618e3773ad1..5d6c6ad6d4e16729cf3bb6e8a4c8f1c74b9253ea 100644 (file)
--- a/doc/bugs/mailto:_links_not_properly_generated_in_rssatom_feeds.mdwn
+++ b/doc/bugs/mailto:_links_not_properly_generated_in_rssatom_feeds.mdwn
@@ -1,3 +1,5 @@
 [[meta title="mailto: links not properly generated in rss/atom feeds"]]
 
 A link like \[this](mailto:foo@bar.org) will not be converted correctly to a mailto link in the rss/atom feeds, but an absolute link instead. See e.g. the logitech post on http://madduck.net/blog/feeds/planet-lca2008/index.rss
 [[meta title="mailto: links not properly generated in rss/atom feeds"]]
 
 A link like \[this](mailto:foo@bar.org) will not be converted correctly to a mailto link in the rss/atom feeds, but an absolute link instead. See e.g. the logitech post on http://madduck.net/blog/feeds/planet-lca2008/index.rss

+
+> fixed --[[Joey]] [[tag done]]