Merge remote-tracking branch 'schmonz/fancypodcast'

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

diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index ff2c2b160a0bded7228384470b2be27f302d9cdd..5957833fc2de44dc20484f616f8813ff0306400b 100644 (file)
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -48,11 +48,11 @@ sub checkcontent (@) {
        }
 
        my $session=$params{session};
        }
 
        my $session=$params{session};

-       my $user=$session->param("name") if $session;
+       my $user=$session->param("name");

        if (pagespec_match($params{page}, $config{moderate_pagespec},
                        location => $params{page},
                        (defined $user ? (user => $user) : ()),
        if (pagespec_match($params{page}, $config{moderate_pagespec},
                        location => $params{page},
                        (defined $user ? (user => $user) : ()),

-                       (defined $ENV{REMOTE_ADDR} ? (ip => $ENV{REMOTE_ADDR}) : ()),
+                       (defined $session->remote_addr() ? (ip => $session->remote_addr()) : ()),

        )) {
                return gettext("comment needs moderation");
        }
        )) {
                return gettext("comment needs moderation");
        }