--- a/Allura/allura/lib/spam/akismetservice.py
+++ b/Allura/allura/lib/spam/akismetservice.py
@@ -10,6 +10,7 @@
class Akismet(akismet.Akismet):
def check(self, text, artifact=None, user=None, content_type='comment', **kw):
log_msg = text
+ kw['comment_content'] = text
kw['comment_type'] = content_type
if artifact:
kw['permalink'] = artifact.url()
@@ -18,7 +19,7 @@
if user:
kw['comment_author'] = user.display_name or user.username
kw['comment_author_email'] = user.email_addresses[0] if user.email_addresses else ''
- kw['user_ip'] = request.environ['REMOTE_ADDR']
+ kw['user_ip'] = request.environ['HTTP_X_REMOTE_ADDR']
kw['user_agent'] = request.environ['HTTP_USER_AGENT']
kw['referrer'] = request.environ['HTTP_REFERER']
res = self.comment_check(text, data=kw, build_data=False)