dirname, basename, bestlink, linkify, pagetitle, titlepage.

* Allow links of the form [[some page|page]], with whitespace in the link
  text.

1 files changed, 1 insertions, 36 deletions

diff --git a/ikiwiki b/ikiwiki
index 745dfddd4..4801c5f92 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -13,42 +13,7 @@ sub usage () { #{{{
 
 sub getconfig () { #{{{
 	if (! exists $ENV{WRAPPED_OPTIONS}) {
-		%config=(
-			wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$|\.rss$)},
-			wiki_link_regexp => qr/\[\[(?:([^\s\]\|]+)\|)?([^\s\]]+)\]\]/,
-			wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]*)\]\]/,
-			wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
-			verbose => 0,
-			wikiname => "wiki",
-			default_pageext => ".mdwn",
-			cgi => 0,
-			rcs => 'svn',
-			notify => 0,
-			url => '',
-			cgiurl => '',
-			historyurl => '',
-			diffurl => '',
-			anonok => 0,
-			rss => 0,
-			sanitize => 1,
-			rebuild => 0,
-			refresh => 0,
-			getctime => 0,
-			wrapper => undef,
-			wrappermode => undef,
-			svnrepo => undef,
-			svnpath => "trunk",
-			srcdir => undef,
-			destdir => undef,
-			templatedir => "/usr/share/ikiwiki/templates",
-			underlaydir => "/usr/share/ikiwiki/basewiki",
-			setup => undef,
-			adminuser => undef,
-			adminemail => undef,
-			plugin => [qw{inline}],
-			headercontent => '',
-		);
-
+		%config=defaultconfig();
 		eval q{use Getopt::Long};
 		GetOptions(
 			"setup|s=s" => \$config{setup},