Made the links to the userpage work in the prev.edit.

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

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 2ad422f5f678028c83bfe3a9fbc68e7528135414..0aa4759d807c3060eed580d58f862c6d22ab9d70 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -287,10 +287,15 @@ sub editcomment ($$) {
        else {
                $type = $config{default_pageext};
        }
+
+
        my @page_types;
        if (exists $IkiWiki::hooks{htmlize}) {
-               @page_types = grep { ! /^_/ } keys %{$IkiWiki::hooks{htmlize}};
+               foreach my $key (grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}}) {
+                       push @page_types, [$key, $IkiWiki::hooks{htmlize}{$key}{longname} || $key];
+               }
        }
+       @page_types=sort @page_types;
 
        $form->field(name => 'do', type => 'hidden');
        $form->field(name => 'sid', type => 'hidden', value => $session->id,
@@ -317,6 +322,13 @@ sub editcomment ($$) {
                        force => 1);
        }
 
+       if (! defined $session->param('name')) {
+               # Make signinurl work and return here.
+               $form->tmpl_param(signinurl => IkiWiki::cgiurl(do => 'signin'));
+               $session->param(postsignin => $ENV{QUERY_STRING});
+               IkiWiki::cgi_savesession($session);
+       }
+
        # The untaint is OK (as in editpage) because we're about to pass
        # it to file_pruned anyway
        my $page = $form->field('page');
@@ -819,13 +831,10 @@ sub page_to_id ($) {
        # comment.
        my $page=shift;
 
-       # It needs to start with a letter.
-       $page="comment_".$page;
-
-       # Encode any illegal characters.
-       $page=~s/([^A-Za-z0-9-_:.])/"__".ord($1)."__"/eg;
+       eval q{use Digest::MD5 'md5_hex'};
+       error($@) if $@;
 
-       return $page;
+       return "comment-".md5_hex($page);
 }
        
 package IkiWiki::PageSpec;