response

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

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index af7e7eccd89603430c7b0f4d5cee65b07c4ae02f..de193bd12b358d2850a823c3e492af1844b4a292 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -742,7 +742,6 @@ sub pagetemplate (@) {
                     $template->query(name => 'commentsurl') ||
                     $template->query(name => 'atomcommentsurl') ||
                     $template->query(name => 'comments')) &&
                     $template->query(name => 'commentsurl') ||
                     $template->query(name => 'atomcommentsurl') ||
                     $template->query(name => 'comments')) &&

-                   length $page && # not dynamic

                    commentsshown($page);
 
        if ($template->query(name => 'comments')) {
                    commentsshown($page);
 
        if ($template->query(name => 'comments')) {


@@ -860,7 +859,7 @@ sub num_comments ($$) {
        my $dir=shift;
 
        my @comments=glob("$dir/$page/$config{comments_pagename}*._comment");
        my $dir=shift;
 
        my @comments=glob("$dir/$page/$config{comments_pagename}*._comment");

-       return @comments;
+       return int @comments;

 }
 
 sub unique_comment_location ($$$$) {
 }
 
 sub unique_comment_location ($$$$) {


@@ -909,10 +908,12 @@ sub match_comment ($$;@) {
        my $page = shift;
        my $glob = shift;
 
        my $page = shift;
        my $glob = shift;
 

-       if (! IkiWiki::isinternal($page)) {
-               return IkiWiki::FailReason->new("$page is not a comment");
-       }
-       my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+       # To see if it's a comment, check the source file type.
+       # Deal with comments that were just deleted.
+       my $source=exists $IkiWiki::pagesources{$page} ?
+               $IkiWiki::pagesources{$page} :
+               $IkiWiki::delpagesources{$page};
+       my $type=IkiWiki::pagetype($source);

        if (defined $type && $type ne "_comment") {
                return IkiWiki::FailReason->new("$page is not a comment");
        }
        if (defined $type && $type ne "_comment") {
                return IkiWiki::FailReason->new("$page is not a comment");
        }


@@ -924,10 +925,10 @@ sub match_comment_pending ($$;@) {
        my $page = shift;
        my $glob = shift;
        
        my $page = shift;
        my $glob = shift;
        

-       if (! IkiWiki::isinternal($page)) {
-               return IkiWiki::FailReason->new("$page is not a pending comment");
-       }
-       my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+       my $source=exists $IkiWiki::pagesources{$page} ?
+               $IkiWiki::pagesources{$page} :
+               $IkiWiki::delpagesources{$page};
+       my $type=IkiWiki::pagetype($source);

        if (defined $type && $type ne "_comment_pending") {
                return IkiWiki::FailReason->new("$page is not a pending comment");
        }
        if (defined $type && $type ne "_comment_pending") {
                return IkiWiki::FailReason->new("$page is not a pending comment");
        }