X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ac3aac560f74457ded48ba3b5a14d0bbbf9b6d92..cedf2c0af568d801fe2cf1917ac0202ce64f838b:/IkiWiki/Plugin/moderatedcomments.pm

diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index b0a328a06..5957833fc 100644
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -19,7 +19,7 @@ sub getsetup () {
 		},
 		moderate_pagespec => {
 			type => 'pagespec',
-			example => 'user(http://*)',
+			example => '*',
 			description => 'PageSpec matching users or comment locations to moderate',
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
@@ -48,11 +48,11 @@ sub checkcontent (@) {
 	}
 
 	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) : ()),
-			(defined $ENV{REMOTE_ADDR} ? (ip => $ENV{REMOTE_ADDR}) : ()),
+			(defined $session->remote_addr() ? (ip => $session->remote_addr()) : ()),
 	)) {
 		return gettext("comment needs moderation");
 	}