Merge branch 'master' into terms

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 0b8b512ee3bab5becf3bc350fb916026bd51b5b0..f02c9a5cd0067b63afc3984575534c38fb0a550b 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -85,7 +85,7 @@ class User < ActiveRecord::Base
   end
 
   def languages
-    attribute_present?(:languages) ? read_attribute(:languages).split(",") : []
+    attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : []
   end
 
   def languages=(languages)