Merge branch 'master' into next

[sup] / lib / sup / buffer.rb

diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
index 12dd11949b90797753e8fefc4037ffad52f5a95f..67ccd86ea533f15e0706233314ebcdd21188af7e 100644 (file)
--- a/lib/sup/buffer.rb
+++ b/lib/sup/buffer.rb
@@ -503,7 +503,7 @@ EOS
   ## returns an array of labels
   def ask_for_labels domain, question, default_labels, forbidden_labels=[]
     default_labels = default_labels - forbidden_labels - LabelManager::RESERVED_LABELS
-    default = default_labels.join(" ")
+    default = default_labels.to_a.join(" ")
     default += " " unless default.empty?
 
     # here I would prefer to give more control and allow all_labels instead of