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

  not just http urls.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index b22109a9399bda180f76dda38f245a614d699d33..9a86aad0bfa4ad7bb8588abf984fc24032f4c349 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -121,8 +121,8 @@ sub absolute_urls ($$) { #{{{
 
        $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;
 } #}}}
 

diff --git a/debian/changelog b/debian/changelog
index 1f1f2a83a17d3efaa15ffe5a1db42b3dcfe5bbbd..e552cac9d901fc60c62d4fc97f6f291fb1154640 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,10 @@ ikiwiki (1.5) UNRELEASED; urgency=low
   * Add support for using git instead of subversion as the RCS backend,
     tremendous thanks to Recai Oktaş for this.
   * Doc updates for git.
+  * Fix absolute url munging in rss generation to support https, ftp, etc urls
+    not just http urls.
 
- -- Joey Hess <joeyh@debian.org>  Fri,  2 Jun 2006 01:13:18 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu,  8 Jun 2006 02:05:57 -0400
 
 ikiwiki (1.4) unstable; urgency=low