web commit by RecaiOktas: UTF-8 test (first entry)

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index b26df006b9d3e1d0ae58249ed4417f0f3c9f3746..786ba70ace16abfaaa02498e3afb7e39a74f321a 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 # Standard ikiwiki setup module.
 # Parameters to import should be all the standard ikiwiki config stuff,
 #!/usr/bin/perl
 # Standard ikiwiki setup module.
 # Parameters to import should be all the standard ikiwiki config stuff,

-# plus hashes for cgiwrapper and svnwrapper, which specify any differing
-# config stuff for them and cause the wrappers to be made.
+# plus an array of wrappers to set up.

 
 use warnings;
 use strict;
 
 use warnings;
 use strict;


@@ -22,18 +21,34 @@ sub setup_standard {
 
        if (! $config{refresh}) {
                debug("generating wrappers..");
 
        if (! $config{refresh}) {
                debug("generating wrappers..");

+               my @wrappers=@{$setup{wrappers}};
+               delete $setup{wrappers};

                my %startconfig=(%config);
                my %startconfig=(%config);

-               foreach my $wrapper (@{$setup{wrappers}}) {
+               foreach my $wrapper (@wrappers) {

                        %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
                        checkconfig();
                        gen_wrapper();
                }
                %config=(%startconfig);
        }
                        %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
                        checkconfig();
                        gen_wrapper();
                }
                %config=(%startconfig);
        }

+       else {
+               delete $setup{wrappers};
+       }
+       

        foreach my $c (keys %setup) {
        foreach my $c (keys %setup) {

-               $config{$c}=possibly_foolish_untaint($setup{$c})
-                       if defined $setup{$c} && ! ref $setup{$c};
+               if (defined $setup{$c}) {
+                       if (! ref $setup{$c}) {
+                               $config{$c}=possibly_foolish_untaint($setup{$c});
+                       }
+                       elsif (ref $setup{$c} eq 'ARRAY') {
+                               $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
+                       }
+               }
+               else {
+                       $config{$c}=undef;
+               }

        }
        }

+

        if (! $config{refresh}) {
                $config{rebuild}=1;
                debug("rebuilding wiki..");
        if (! $config{refresh}) {
                $config{rebuild}=1;
                debug("rebuilding wiki..");