enable prefix_directives by default

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 97c835cf6281c986600af120b1338a4ac01392d1..127c9e5d7c98f11ded3541eb52a6d8161bce0a54 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -194,7 +194,7 @@ sub getsetup () {
        },
        prefix_directives => {
                type => "boolean",
-               default => 0,
+               default => 1,
                description => "use '!'-prefixed preprocessor directives?",
                safe => 0, # changing requires manual transition
                rebuild => 1,
@@ -951,7 +951,7 @@ sub beautify_urlpath ($) {
 
        # Ensure url is not an empty link, and if necessary,
        # add ./ to avoid colon confusion.
-       if ($url !~ /^\// && $url !~ /^\.\.\//) {
+       if ($url !~ /^\// && $url !~ /^\.\.?\//) {
                $url="./$url";
        }