Merge branch 'master' into tova

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6a1823c5a940461ab8cf8ad5952a889323713bbf..c14124f79f221fdd638d6f781b205e87bd6193a0 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -538,7 +538,7 @@ sub beautify_urlpath ($) { #{{{
 
        # Ensure url is not an empty link, and
        # if it's relative, make that explicit to avoid colon confusion.
 
        # Ensure url is not an empty link, and
        # if it's relative, make that explicit to avoid colon confusion.

-       if ($url !~ /\//) {
+       if ($url !~ /^\//) {

                $url="./$url";
        }
 
                $url="./$url";
        }
 


@@ -826,7 +826,8 @@ sub preprocess ($$$;$$) { #{{{
                        *)?             # 0 or more parameters
                        \]\]            # directive closed
                }sx;
                        *)?             # 0 or more parameters
                        \]\]            # directive closed
                }sx;

-       } else {
+       }
+       else {

                $regex = qr{
                        (\\?)           # 1: escape?
                        \[\[(!?)        # directive open; 2: optional prefix
                $regex = qr{
                        (\\?)           # 1: escape?
                        \[\[(!?)        # directive open; 2: optional prefix