diff options
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb | 8 | ||||
| m--------- | vendor/plugins/alavetelitheme | 0 | ||||
| -rw-r--r-- | vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb index dad3289d0..d8f0adaa3 100644 --- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb +++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb @@ -679,12 +679,12 @@ module ActsAsXapian values << single_xapian_value(field, type=type) end end - if values[0].kind_of?(String) - values = values.reject{|x| x.nil?} - value = values.join(" ") - else + if values[0].kind_of?(Array) values = values.flatten value = values.reject{|x| x.nil?} + else + values = values.reject{|x| x.nil?} + value = values.join(" ") end end else diff --git a/vendor/plugins/alavetelitheme b/vendor/plugins/alavetelitheme deleted file mode 160000 -Subproject c52742cb7c587ed7486686e8ddbe2c4fe51e436 diff --git a/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb b/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb index b52157a2f..39fa4d959 100644 --- a/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb +++ b/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb @@ -61,7 +61,7 @@ namespace :gettext do # require 'gettext_activerecord/parser' desc "write the model attributes to <locale_path>/model_attributes.rb" task :store_model_attributes => :environment do - FastGettext.silence_errors + #FastGettext.silence_errors require 'gettext_i18n_rails/model_attributes_finder' require 'gettext_i18n_rails/active_record' |