fix inlining bug

diff --git a/IkiWiki/Plugin/postal.pm b/IkiWiki/Plugin/postal.pm
index 125d351117f7ee06acea49e081adaff0e1cd1e97..8eb0542e287b7c4997ded7eea450e0cad3c4a9eb 100644 (file)
--- a/IkiWiki/Plugin/postal.pm
+++ b/IkiWiki/Plugin/postal.pm
@@ -48,7 +48,7 @@ sub pagetemplate (@)
 
     my $subpage_name=$config{postal_pagename} || "comments";
 
 
     my $subpage_name=$config{postal_pagename} || "comments";
 

-    my $comment_page=$destpage . "/" . $subpage_name;
+    my $comment_page=$page . "/" . $subpage_name;

     add_depends($params{page},$comment_page);
 
 
     add_depends($params{page},$comment_page);
 
 


@@ -61,7 +61,9 @@ sub pagetemplate (@)
     }  
     
     my $comment_link=undef;
     }  
     
     my $comment_link=undef;

+#    debug("pagesources{$comment_page}=$pagesources{$comment_page}\n");

     if (exists $pagesources{$comment_page}){
     if (exists $pagesources{$comment_page}){

+#      debug("looking for htmlink $page $destpage $comment_page\n");

        $comment_link=htmllink($page,$destpage,$comment_page,
                               linktext=>gettext("Read Comments"));
     }
        $comment_link=htmllink($page,$destpage,$comment_page,
                               linktext=>gettext("Read Comments"));
     }

diff --git a/filters/iki-address-test.pl b/filters/iki-address-test.pl
index 289aaf61571c4f2677e63771df8f9116cf8c1aed..813157cb85768f6c8ffa47c7568b51f5a3a86607 100644 (file)
--- a/filters/iki-address-test.pl
+++ b/filters/iki-address-test.pl
@@ -1,19 +1,20 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

-use Mail::Internet;
-use Convert::YText 'decode_ytext';
+use lib "..";
+use strict;
+use Email::Filter;
+use Convert::YText qw(decode_ytext);

 
 my $prefix="-comment-";
 
 my $prefix="-comment-";

-my $mail = Mail::Internet->new([<>]);
+my $message=Email::Filter->new();

 
 

-my $to = $mail->get('To:');
+$message->exit(0); # do not exit after delivery

 
 

-if ($to =~ m/$prefix([A-Za-z0-9\.\+\=\-_\~]+)\@/){
-    my $key=$1;
-    my $page=decode_ytext($key);
-    $mail->replace('X-IkiWiki-Page:',$page);
-}
+my $to=$message->to;
+if ($to =~ m/$prefix($Convert::YText::valid_rex)/){
+    my $page=decode_ytext($1);

 
 

-$mail->print(\*STDOUT);
+    print STDERR "page=$page";
+}

 
 
 
 

diff --git a/filters/postal-accept.pl b/filters/postal-accept.pl
index 1c14758f1d352a707104841982817893360d36fe..f49ac174d81737b87faf6510a0cb610c80695968 100644 (file)
--- a/filters/postal-accept.pl
+++ b/filters/postal-accept.pl
@@ -49,12 +49,14 @@ if ($to =~ m/$prefix($Convert::YText::valid_rex)/){
     chdir $config{srcdir} || die ("chdir $config{srcdir}: $!");
 
     my $comments_folder=$page."/comments".$folder_ext;
     chdir $config{srcdir} || die ("chdir $config{srcdir}: $!");
 
     my $comments_folder=$page."/comments".$folder_ext;

-
+    my $comments_page=$page."/comments";

     # write the message to the comment
     
     $message->accept($comments_folder) || die("delivery failed");
     
     debug("delivered to $comments_folder\n");
     # write the message to the comment
     
     $message->accept($comments_folder) || die("delivery failed");
     
     debug("delivered to $comments_folder\n");

+    
+    IkiWiki::add_depends($page,$comments_page);

     # update vcs, copied from Ikiwiki::Plugins::attachment
     
     if ($config{rcs}) {
     # update vcs, copied from Ikiwiki::Plugins::attachment
     
     if ($config{rcs}) {