X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7b4600df3f8b8c2112a8df6c018d64f04db1ebe8..b1fac017904dc2e1c6327f0a0a2a2620042c0768:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 77c7744f9..235a72102 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -21,7 +21,7 @@ sub getconfig () { #{{{
 			wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
 			wiki_link_regexp => qr/\[\[([^\s\]]+)\]\]/,
 			wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]+)\]\]/,
-			wiki_file_regexp => qr/(^[-A-Za-z0-9_.\&;:\/+]+$)/,
+			wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,
 			verbose => 0,
 			wikiname => "wiki",
 			default_pageext => ".mdwn",
@@ -262,7 +262,7 @@ sub htmllink ($$;$$) { #{{{
 		$bestlink="$page/".lc($link);
 	}
 
-	my $linktext=pagetitle($link);
+	my $linktext=pagetitle(basename($link));
 	
 	return $linktext if length $bestlink && $page eq $bestlink;
 	
@@ -466,7 +466,13 @@ sub globlist_match ($$) { #{{{
 sub main () { #{{{
 	getconfig();
 	
-	if ($config{setup}) {
+	if ($config{cgi}) {
+		lockwiki();
+		loadindex();
+		require IkiWiki::CGI;
+		cgi();
+	}
+	elsif ($config{setup}) {
 		require IkiWiki::Setup;
 		setup();
 	}
@@ -475,12 +481,6 @@ sub main () { #{{{
 		require IkiWiki::Wrapper;
 		gen_wrapper();
 	}
-	elsif ($config{cgi}) {
-		lockwiki();
-		loadindex();
-		require IkiWiki::CGI;
-		cgi();
-	}
 	else {
 		lockwiki();
 		loadindex();