Commit for OSQA Jira 501. Minor change in syntax of Akismet can_bypass_spam_check...

[osqa.git] / forum / models / node.py

diff --git a/forum/models/node.py b/forum/models/node.py
index 6a181659956e735158ccffd257c799841668852e..0dfe1d2cea73ebe7e90ed70bb325c263900250a9 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -6,6 +6,7 @@ import markdown
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags

+from forum.utils.userlinking import auto_user_link

 from forum.utils.html import sanitize_html
 from utils import PickledObjectField
 
 from forum.utils.html import sanitize_html
 from utils import PickledObjectField
 


@@ -331,13 +332,13 @@ class Node(BaseModel, NodeContent):
     def create_revision(self, user, **kwargs):
         number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1
         revision = self._create_revision(user, number, **kwargs)
     def create_revision(self, user, **kwargs):
         number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1
         revision = self._create_revision(user, number, **kwargs)

-        self.activate_revision(user, revision)
+        self.activate_revision(user, revision, extensions=['urlize'])

         return revision
 
         return revision
 

-    def activate_revision(self, user, revision, *extensions):
+    def activate_revision(self, user, revision, extensions=['urlize']):

         self.title = revision.title
         self.tagnames = revision.tagnames
         self.title = revision.title
         self.tagnames = revision.tagnames

-        self.body = self._as_markdown(revision.body, *extensions)
+        self.body = auto_user_link(self, self._as_markdown(revision.body, *extensions))

 
         self.active_revision = revision
         self.update_last_activity(user)
 
         self.active_revision = revision
         self.update_last_activity(user)