document external links

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

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3cafcbe9c6860dbfb95087da454bf364617f1292..d1558001aeff7b177a907d5be34f958df30692a1 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -433,7 +433,8 @@ sub editcomment ($$) {
 
        $content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 
-       my $editcontent = $form->field('editcontent') || '';
+       my $editcontent = $form->field('editcontent');
+       $editcontent="" if ! defined $editcontent;
        $editcontent =~ s/\r\n/\n/g;
        $editcontent =~ s/\r/\n/g;
        $editcontent =~ s/"/\\"/g;
@@ -536,7 +537,7 @@ sub editcomment ($$) {
        }
        else {
                IkiWiki::showform ($form, \@buttons, $session, $cgi,
-                       forcebaseurl => $baseurl);
+                       forcebaseurl => $baseurl, page => $page);
        }
 
        exit;
@@ -659,16 +660,22 @@ sub comments_pending () {
 
        eval q{use File::Find};
        error($@) if $@;
+       eval q{use Cwd};
+       error($@) if $@;
+       my $origdir=getcwd();
 
        my $find_comments=sub {
                my $dir=shift;
                my $extension=shift;
                return unless -d $dir;
+
+               chdir($dir) || die "chdir $dir: $!";
+
                find({
                        no_chdir => 1,
                        wanted => sub {
                                my $file=decode_utf8($_);
-                               $file=~s/^\Q$dir\E\/?//;
+                               $file=~s/^\.\///;
                                return if ! length $file || IkiWiki::file_pruned($file)
                                        || -l $_ || -d _ || $file !~ /\Q$extension\E$/;
                                my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
@@ -677,7 +684,9 @@ sub comments_pending () {
                                        push @ret, [$f, $dir, $ctime];
                                }
                        }
-               }, $dir);
+               }, ".");
+
+               chdir($origdir) || die "chdir $origdir: $!";
        };
        
        $find_comments->($config{srcdir}, "._comment_pending");
@@ -859,7 +868,7 @@ sub num_comments ($$) {
        my $dir=shift;
 
        my @comments=glob("$dir/$page/$config{comments_pagename}*._comment");
-       return @comments;
+       return int @comments;
 }
 
 sub unique_comment_location ($$$$) {
@@ -908,11 +917,13 @@ sub match_comment ($$;@) {
        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});
-       if (defined $type && $type ne "_comment") {
+       # 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=defined $source ? IkiWiki::pagetype($source) : undef;
+       if (! defined $type || $type ne "_comment") {
                return IkiWiki::FailReason->new("$page is not a comment");
        }
 
@@ -923,11 +934,11 @@ sub match_comment_pending ($$;@) {
        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});
-       if (defined $type && $type ne "_comment_pending") {
+       my $source=exists $IkiWiki::pagesources{$page} ?
+               $IkiWiki::pagesources{$page} :
+               $IkiWiki::delpagesources{$page};
+       my $type=defined $source ? IkiWiki::pagetype($source) : undef;
+       if (! defined $type || $type ne "_comment_pending") {
                return IkiWiki::FailReason->new("$page is not a pending comment");
        }