foo

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 4e64e4031d0d5996f68d072d4bac06e6a3aa4da4..ea3833a37d5e98f062db2d5cdc410962a29a9330 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -172,7 +172,7 @@ sub findlinks ($) { #{{{
        my $content=shift;
 
        my @links;
-       while ($content =~ /$config{wiki_link_regexp}/g) {
+       while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
                push @links, lc($1);
        }
        return @links;
@@ -247,7 +247,9 @@ sub linkify ($$) { #{{{
        my $content=shift;
        my $file=shift;
 
-       $content =~ s/$config{wiki_link_regexp}/htmllink(pagename($file), $1)/eg;
+       $content =~ s{(\\?)$config{wiki_link_regexp}}{
+               $1 ? "[[$2]]" : htmllink(pagename($file), $2)
+       }eg;
        
        return $content;
 } #}}}
@@ -1150,6 +1152,7 @@ sub cgi () { #{{{
 
 sub setup () { # {{{
        my $setup=possibly_foolish_untaint($config{setup});
+       delete $config{setup};
        open (IN, $setup) || error("read $setup: $!\n");
        local $/=undef;
        my $code=<IN>;
@@ -1157,7 +1160,15 @@ sub setup () { # {{{
        close IN;
        eval $code;
        error($@) if $@;
-       print "ikiwiki setup complete\n";
+       print "$config{wikiname} setup complete, now forcing a rebuild.\n";
+       $config{cgi}=0;
+       $config{rebuild}=1;
+       foreach my $c (keys %config) {
+               $config{$c}=possibly_foolish_untaint($config{$c})
+                       if defined $config{$c};
+       }
+       refresh();
+       saveindex();
        exit;
 } #}}}