From: Tom Hughes <tom@compton.nu>
Date: Sun, 15 Apr 2018 18:55:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1816'
X-Git-Tag: live~3067
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c174845258f8bb55d5fa969563604b14dedea210?hp=-c

Merge remote-tracking branch 'upstream/pull/1816'
---

c174845258f8bb55d5fa969563604b14dedea210
diff --combined app/views/diary_entry/_diary_entry.html.erb
index 46565869e,e4b2c2143..6b585b3f3
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@@ -1,6 -1,6 +1,6 @@@
  <div class='diary_post'>
    <div class='post_heading clearfix'>
 -    <% if !@this_user %>
 +    <% if !@user %>
        <%= user_thumbnail diary_entry.user %>
      <% end %>
  
@@@ -23,7 -23,7 +23,7 @@@
    <ul class='secondary-actions clearfix'>
      <% if params[:action] == 'list' %>
        <li><%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %></li>
-       <li><%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %></li>
+       <li><%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :message => { :title => "Re: #{diary_entry.title}" } %></li>
        <li><%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %></li>
      <% end %>