Merge branch 'master' of git://github.com/rafalp/Misago

misago/alerts/models.py

@@ -38,7 +38,7 @@ class Alert(models.Model):
             self.vars_raw = {var: url}
         return self
     
-    def user(self, var, user):
+    def profile(self, var, user):
         from django.core.urlresolvers import reverse
         return self.url(var, user.username, reverse('user', kwargs={'user': user.pk, 'username': user.username_slug}))
     

misago/threads/views/posting.py

@@ -134,7 +134,7 @@ class PostingView(BaseView):
                         # Notify quoted poster of reply?
                         if self.quote and self.quote.user_id and self.quote.user_id != request.user.pk:
                             alert = self.quote.user.alert(ugettext_lazy("%(username)s has replied to your post in thread %(thread)s").message)
-                            alert.user('username', request.user)
+                            alert.profile('username', request.user)
                             alert.post('thread', self.thread, post)
                             alert.save_all()
                         if (self.request.settings.thread_length > 0