From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 11 Jul 2008 13:52:17 +0000 (-0400)
Subject: Revert "Fix a bug with links to pages whose names contained colons."
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/810a355308d276ef922ff4312bff0c7935676633?hp=d5de560f50cee1b3f7facb4a7b53d90556ec091c;ds=sidebyside

Revert "Fix a bug with links to pages whose names contained colons."

This reverts commit e25c3a0a7caa9783c657efe86611929ecb7bd4a3.

I didn't think that through far enough; beautify_url may be called on full
urls, which don't start with "/"!

Conflicts:

	debian/changelog
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6e03121c0..4368870b8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -539,12 +539,7 @@ sub beautify_url ($) { #{{{
 	if ($config{usedirs}) {
 		$url =~ s!/index.$config{htmlext}$!/!;
 	}
-
-	# Ensure url is not an empty link, and
-	# if it's relative, make that explicit to avoid colon confusion.
-	if ($url !~ /\//) {
-		$url="./$url";
-	}
+	$url =~ s!^$!./!; # Browsers don't like empty links...
 
 	return $url;
 } #}}}