From 6cbe4075f4dfb6120d904267c30c4a8e59bd22ee Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Fri, 8 Oct 2010 15:59:32 -0700
Subject: [PATCH] CGI unescape incoming salmons

---
 lib/diaspora/user/receiving.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb
index a16727c26..a9d3e0f62 100644
--- a/lib/diaspora/user/receiving.rb
+++ b/lib/diaspora/user/receiving.rb
@@ -2,7 +2,7 @@ module Diaspora
   module UserModules
     module Receiving
       def receive_salmon salmon_xml
-        salmon = Salmon::SalmonSlap.parse salmon_xml, self
+        salmon = Salmon::SalmonSlap.parse(CGI::unescape salmon_xml, self)
         if salmon.verified_for_key?(salmon.author.public_key)
           Rails.logger.info("data in salmon: #{salmon.parsed_data}")
           self.receive(salmon.parsed_data)