diff options
| author | Jonne Haß <me@mrzyx.de> | 2014-08-30 22:09:08 +0400 |
|---|---|---|
| committer | Jonne Haß <me@mrzyx.de> | 2014-08-30 22:09:08 +0400 |
| commit | 1515848120e31dbaa417e3a265a7f718bf637a25 (patch) | |
| tree | b6df2ca41af36467a59ed6a81665ed6615f3a9a5 /app | |
| parent | 1c9f030f7ff5f3f3f052860177ebd19d35144228 (diff) | |
| parent | 5d549f553b488c7e71f11f6a5ae4d15ec1b37fa3 (diff) | |
Merge branch 'release/0.4.1.0' into develop
Conflicts:
app/controllers/conversations_controller.rb
spec/controllers/conversations_controller_spec.rb
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/conversations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb index 58638651d..1ebc4d81c 100644 --- a/app/controllers/conversations_controller.rb +++ b/app/controllers/conversations_controller.rb @@ -87,7 +87,7 @@ class ConversationsController < ApplicationController current_user.contacts.where(:sharing => true).joins(:person => :profile). select("contacts.id, profiles.first_name, profiles.last_name, people.diaspora_handle").to_sql } - ).map{|r| {:value => r[0], :name => Person.name_from_attrs(r[1], r[2], r[3]).gsub(/(")/, "'")} } + ).map{|r| {:value => r[0], :name => ERB::Util.h(Person.name_from_attrs(r[1], r[2], r[3]).gsub(/(")/, "'"))} } @contact_ids = "" |