X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e35cefac5d9d25ddedbf2ab01773034a46d72220..ffc0be87d7eca4de4dbc91d740d36b7b40bfa911:/ikiwiki?ds=sidebyside

diff --git a/ikiwiki b/ikiwiki
index f8b43d720..c5ac7c0b8 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",
@@ -32,8 +32,10 @@ sub getconfig () { #{{{
 			historyurl => '',
 			diffurl => '',
 			anonok => 0,
-			rss => 1,
+			rss => 0,
 			rebuild => 0,
+			refresh => 0,
+			getctime => 0,
 			wrapper => undef,
 			wrappermode => undef,
 			srcdir => undef,
@@ -49,6 +51,8 @@ sub getconfig () { #{{{
 			"wikiname=s" => \$config{wikiname},
 			"verbose|v!" => \$config{verbose},
 			"rebuild!" => \$config{rebuild},
+			"refresh!" => \$config{refresh},
+			"getctime" => \$config{getctime},
 			"wrappermode=i" => \$config{wrappermode},
 			"svn!" => \$config{svn},
 			"anonok!" => \$config{anonok},
@@ -262,7 +266,7 @@ sub htmllink ($$;$$) { #{{{
 		$bestlink="$page/".lc($link);
 	}
 
-	my $linktext=pagetitle($link);
+	my $linktext=pagetitle(basename($link));
 	
 	return $linktext if length $bestlink && $page eq $bestlink;
 	
@@ -486,6 +490,7 @@ sub main () { #{{{
 		loadindex();
 		require IkiWiki::Render;
 		rcs_update();
+		rcs_getctime() if $config{getctime};
 		refresh();
 		saveindex();
 	}