From b9b7d1b8f1878ba59c6f9cffdea006de317b11fb Mon Sep 17 00:00:00 2001
From: Luke Faraone <lfaraone@humbughq.com>
Date: Mon, 10 Dec 2012 15:39:28 -0500
Subject: [PATCH] Linebreak zephyrs.

(imported from commit c77499b17ce195e36169bcb39a5f5bdfe6a3ce51)
---
 zephyr/models.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zephyr/models.py b/zephyr/models.py
index 896d68278e..5bc34bbfd5 100644
--- a/zephyr/models.py
+++ b/zephyr/models.py
@@ -398,6 +398,9 @@ def bulk_create_clients(client_list):
             existing_clients.add(name)
     batch_bulk_create(Client, clients_to_create)
 
+def linebreak(string):
+    return string.replace('\n\n', '<p/>').replace('\n', '<br/>')
+
 class Message(models.Model):
     sender = models.ForeignKey(UserProfile)
     recipient = models.ForeignKey(Recipient)
@@ -454,7 +457,7 @@ class Message(models.Model):
 
         if apply_markdown:
 #            obj['content'] = bugdown.convert(self.content)
-            obj['content'] = escape(self.content)
+            obj['content'] = linebreak(escape(self.content))
             obj['content_type'] = 'text/html'
         else:
             obj['content'] = self.content