X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c987aee47acfcc0df4c1ac2667d9c63133e99d2b..57abd340f993ff7e25af846eb40c755aa0f374dc:/IkiWiki.pm?ds=sidebyside

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d9b3dcdb4..5a05a0f73 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -538,7 +538,12 @@ sub beautify_url ($) { #{{{
 	if ($config{usedirs}) {
 		$url =~ s!/index.$config{htmlext}$!/!;
 	}
-	$url =~ s!^$!./!; # Browsers don't like empty links...
+
+	# Ensure url is not an empty link, and
+	# if it's relative, make that explicit to avoid colon confusion.
+	if ($url !~ /\//) {
+		$url="./$url";
+	}
 
 	return $url;
 } #}}}
@@ -596,7 +601,7 @@ sub htmllink ($$$;@) { #{{{
 			return "<span class=\"createlink\"><a href=\"".
 				cgiurl(
 					do => "create",
-					page => pagetitle(lc($link), 1),
+					page => lc($link),
 					from => $lpage
 				).
 				"\" rel=\"nofollow\">?</a>$linktext</span>"
@@ -1290,6 +1295,13 @@ sub pagespec_valid ($) { #{{{
 	my $sub=pagespec_translate($spec);
 	return ! $@;
 } #}}}
+	
+sub glob2re ($) { #{{{
+	my $re=quotemeta(shift);
+	$re=~s/\\\*/.*/g;
+	$re=~s/\\\?/./g;
+	return $re;
+} #}}}
 
 package IkiWiki::FailReason;
 
@@ -1337,12 +1349,8 @@ sub match_glob ($$;@) { #{{{
 		$glob="$from/$glob" if length $from;
 	}
 
-	# turn glob into safe regexp
-	$glob=quotemeta($glob);
-	$glob=~s/\\\*/.*/g;
-	$glob=~s/\\\?/./g;
-
-	if ($page=~/^$glob$/i) {
+	my $regexp=IkiWiki::glob2re($glob);
+	if ($page=~/^$regexp$/i) {
 		if (! IkiWiki::isinternal($page) || $params{internal}) {
 			return IkiWiki::SuccessReason->new("$glob matches $page");
 		}