Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / bugs / multiple_pages_with_same_name.mdwn

diff --git a/doc/bugs/multiple_pages_with_same_name.mdwn b/doc/bugs/multiple_pages_with_same_name.mdwn
index 5ddfb1f6b17bad4e992e8947095780564655f255..20c38c06202c1d0b7f1fbd7f33da7f31af2cbb48 100644 (file)
--- a/doc/bugs/multiple_pages_with_same_name.mdwn
+++ b/doc/bugs/multiple_pages_with_same_name.mdwn
@@ -28,14 +28,14 @@ Suggestions welcome.
     index 4e4da11..853f905 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
     index 4e4da11..853f905 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm

-    @@ -618,7 +618,7 @@ sub pagename ($) { #{{{
+    @@ -618,7 +618,7 @@ sub pagename ($) {

      
        my $type=pagetype($file);
        my $page=$file;
     -  $page=~s/\Q.$type\E*$// if defined $type;
     +  $page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{leavesuffix};
        return $page;
      
        my $type=pagetype($file);
        my $page=$file;
     -  $page=~s/\Q.$type\E*$// if defined $type;
     +  $page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{leavesuffix};
        return $page;

-     } #}}}
+     }

      
     diff --git a/t/pagename.t b/t/pagename.t
     index 96e6a87..58811b9 100755
      
     diff --git a/t/pagename.t b/t/pagename.t
     index 96e6a87..58811b9 100755


@@ -61,7 +61,7 @@ I wonder if this patch will also be useful:
     index 752d176..3f1b67b 100644
     --- a/IkiWiki/Render.pm
     +++ b/IkiWiki/Render.pm
     index 752d176..3f1b67b 100644
     --- a/IkiWiki/Render.pm
     +++ b/IkiWiki/Render.pm

-    @@ -279,7 +279,11 @@ sub refresh () { #{{{
+    @@ -279,7 +279,11 @@ sub refresh () {

                                else {
                                        $f=~s/^\Q$config{srcdir}\E\/?//;
                                        push @files, $f;
                                else {
                                        $f=~s/^\Q$config{srcdir}\E\/?//;
                                        push @files, $f;