* Add support for links of the form [../foo]], this links to the page

[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d42ceffa08d0767743d5036ab9b6948a2ffd19da..77c164e34a61f6cac39e7acb16f331aedfd21878 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,8 +30,11 @@ sub setup_standard {
                }
                delete $setup{disable_plugins};
        }
+       if (exists $setup{exclude}) {
+               push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
+       }
 
-       if (! $config{refresh}) {
+       if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
                debug("generating wrappers..");
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};
@@ -43,9 +46,6 @@ sub setup_standard {
                }
                %config=(%startconfig);
        }
-       else {
-               delete $setup{wrappers};
-       }
        
        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {
@@ -55,13 +55,21 @@ sub setup_standard {
                        elsif (ref $setup{$c} eq 'ARRAY') {
                                $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
                        }
+                       elsif (ref $setup{$c} eq 'HASH') {
+                               foreach my $key (keys %{$setup{$c}}) {
+                                       $config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
+                               }
+                       }
                }
                else {
                        $config{$c}=undef;
                }
        }
 
-       if (! $config{refresh}) {
+       if ($config{render}) {
+               commandline_render();
+       }
+       elsif (! $config{refresh}) {
                $config{rebuild}=1;
                debug("rebuilding wiki..");
        }
@@ -69,6 +77,7 @@ sub setup_standard {
                debug("refreshing wiki..");
        }
 
+       loadplugins();
        checkconfig();
        lockwiki();
        loadindex();