From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Thu, 8 Jun 2006 06:07:45 +0000 (+0000)
Subject: * Fix absolute url munging in rss generation to support https, ftp, etc urls
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/57743730468b4a7ccaa724ac82739ca0c79de809

* 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 b22109a93..9a86aad0b 100644
--- 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 1f1f2a83a..e552cac9d 100644
--- 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