commit 5e2d930b5674799324432f46a1f31abb4b7b273b
parent 5679ace858467f01f899e359937624f43e97f84d
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Wed, 30 Sep 2009 17:18:14 -0400
Merge branch 'master' into next
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
@@ -413,7 +413,7 @@ private
notice, sig, decryptedm = CryptoManager.decrypt payload
if decryptedm # managed to decrypt
children = message_to_chunks(decryptedm, true)
- [notice, sig] + children
+ [notice, sig].compact + children
else
[notice]
end
@@ -466,7 +466,7 @@ private
notice, sig, decryptedm = CryptoManager.decrypt m.body
if decryptedm # managed to decrypt
children = message_to_chunks decryptedm, true
- [notice, sig] + children
+ [notice, sig].compact + children
else
[notice]
end