← Back to branch summary

~widelands-dev/widelands-website/django_staticfiles

« back to all changes in this revision

Viewing changes to pybb/forms.py

merged trunk and resolved conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
pybb/forms.py
25
25
        self.user = kwargs.pop('user', None)
26
26
        self.topic = kwargs.pop('topic', None)
27
27
        self.forum = kwargs.pop('forum', None)
28
 
        self.ip = kwargs.pop('ip', None)
29
28
        super(AddPostForm, self).__init__(*args, **kwargs)
30
29
 
31
30
        if self.topic:
54
53
            topic_is_new = False
55
54
            topic = self.topic
56
55
 
57
 
        post = Post(topic=topic, user=self.user, user_ip=self.ip,
 
56
        post = Post(topic=topic, user=self.user,
58
57
                    markup=self.cleaned_data['markup'],
59
58
                    body=self.cleaned_data['body'])
60
59
        post.save(*args, **kwargs)