diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 4 | ||||
| -rw-r--r-- | app/views/contact_mailer/from_admin_message.text.erb | 1 | ||||
| -rw-r--r-- | app/views/request/show.html.erb | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 257acd0fc..306d6ad4a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -106,7 +106,9 @@ class User < ActiveRecord::Base name.strip! end if self.public_banned? - name = _("{{user_name}} (Account suspended)", :user_name=>name) + # Use interpolation to return a string rather than a SafeBuffer so that + # gsub can be called on it until we upgrade to Rails 3.2 + name = "#{_("{{user_name}} (Account suspended)", :user_name=> name)}" end name end diff --git a/app/views/contact_mailer/from_admin_message.text.erb b/app/views/contact_mailer/from_admin_message.text.erb index 4169d8d3a..3af759c5d 100644 --- a/app/views/contact_mailer/from_admin_message.text.erb +++ b/app/views/contact_mailer/from_admin_message.text.erb @@ -1,2 +1 @@ <%= raw @message %> - diff --git a/app/views/request/show.html.erb b/app/views/request/show.html.erb index 4b0663f76..1d5b9977f 100644 --- a/app/views/request/show.html.erb +++ b/app/views/request/show.html.erb @@ -25,6 +25,7 @@ <div id="left_column"> <h1><%=h(@info_request.title)%></h1> + <% if !@info_request.is_external? && @info_request.user.profile_photo %> <p class="user_photo_on_request"> <img src="<%= get_profile_photo_url(:url_name => @info_request.user.url_name) %>" alt=""> |