diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-06-08 06:07:45 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-06-08 06:07:45 +0000 |
| commit | 57743730468b4a7ccaa724ac82739ca0c79de809 (patch) | |
| tree | 208e5f447c2907e146140277778256ecb96f454c | |
| parent | 54cf7622bfb52db216fcdcf815a7536670c7c37f (diff) | |
| download | ikiwiki-57743730468b4a7ccaa724ac82739ca0c79de809.tar ikiwiki-57743730468b4a7ccaa724ac82739ca0c79de809.tar.gz | |
* Fix absolute url munging in rss generation to support https, ftp, etc urls
not just http urls.
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 5 insertions, 3 deletions
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 |