From bb8a9f0b3f583814ef69e1c536f0734c225b90fe Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 30 Aug 2011 10:12:35 -0700
Subject: [PATCH] small bug in markdownify to prevent barfing with a nil
 message

---
 app/helpers/markdownify_helper.rb       | 1 +
 spec/helpers/markdownify_helper_spec.rb | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/helpers/markdownify_helper.rb b/app/helpers/markdownify_helper.rb
index 7ab063cd3..42febefee 100644
--- a/app/helpers/markdownify_helper.rb
+++ b/app/helpers/markdownify_helper.rb
@@ -6,6 +6,7 @@ require File.expand_path("#{Rails.root}/lib/diaspora/markdownify")
 
 module MarkdownifyHelper
   def markdownify(message, render_options={})
+    return '' if message.blank?
     markdown_options = {
       :autolink            => true,
       :fenced_code_blocks  => true,
diff --git a/spec/helpers/markdownify_helper_spec.rb b/spec/helpers/markdownify_helper_spec.rb
index 1349b0033..e7f07f5a5 100644
--- a/spec/helpers/markdownify_helper_spec.rb
+++ b/spec/helpers/markdownify_helper_spec.rb
@@ -290,6 +290,10 @@ describe MarkdownifyHelper do
       end
     end
 
+    it 'does not barf is message is nil' do
+      markdownify(nil).should == ''
+    end
+
     context 'performance' do
       before do
         @message = "HHello,Hello_, I _am a strong robot.*Hello, I am *a strong robot.Hello, I am a strong robot.Hello, I am a strong robot.Hello, I am a strong robot.Hello, I am a **strong robot.Hello, I am _a _strong *robot**.Hello*, I am a strong "