Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Re-enable markdown rendering for API users and the github bot 

(imported from commit 31db13ef8b7e5224a07f784247092e2eb9cd1654)
This commit is contained in:
Zev Benjamin 2012-12-11 11:13:13 -05:00 committed by Tim Abbott
parent 100df7e349
commit ebb9cfa65d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zephyr/models.py
View File

@ -457,8 +457,10 @@ class Message(models.Model):
gravatar_hash = gravatar_hash(self.sender.user.email)) gravatar_hash = gravatar_hash(self.sender.user.email))
if apply_markdown: if apply_markdown:
# obj['content'] = bugdown.convert(self.content) if self.sending_client.name in ('API', 'github_bot'):
obj['content'] = linebreak(escape(self.content)) obj['content'] = bugdown.convert(self.content)
else:
obj['content'] = linebreak(escape(self.content))
obj['content_type'] = 'text/html' obj['content_type'] = 'text/html'
else: else:
obj['content'] = self.content obj['content'] = self.content