scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SMILES_SUPPORT setting

Browse source
This commit is contained in:
slav0nic 2009-05-25 14:08:24 +03:00
parent b9a33e57c5
commit 3726d40145
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/forum/models.py
View file

@ -199,7 +199,8 @@ class Post(models.Model):
raise Exception('Invalid markup property: %s' % self.markup)
self.body_text = strip_tags(self.body_html)
self.body_html = urlize(self.body_html)
self.body_html = smiles(self.body_html)
if forum_settings.SMILES_SUPPORT:
self.body_html = smiles(self.body_html)
super(Post, self).save(*args, **kwargs)
def get_absolute_url(self):
@ -345,8 +346,8 @@ class PrivateMessage(models.Model):
raise Exception('Invalid markup property: %s' % self.markup)
self.body_text = strip_tags(self.body_html)
self.body_html = urlize(self.body_html)
self.body_html = smiles(self.body_html)
if forum_settings.SMILES_SUPPORT:
self.body_html = smiles(self.body_html)
new = self.id is None
super(PrivateMessage, self).save(*args, **kwargs)

3
apps/forum/settings.py
View file

@ -84,4 +84,5 @@ SMILES = ((r'(:|=)\)', EMOTION_SMILE), #:), =)
(r':rolleyes:', EMOTION_ROLL),
(r':cool:', EMOTION_COOL)
)
SMILES = get('SMILES', SMILES)
SMILES = get('SMILES', SMILES)
SMILES_SUPPORT = get('SMILES_SUPPORT', True)