Rails3: view: html_safe for common/_calendar.html.erb

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8307 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index 147c49b2cf01812e11a2e215392dcf3558be7f0f..7951b68ce4c54e2d1eeef2fb868354b89f2cb7ce 100644 (file)
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -6,7 +6,7 @@
 <tr>
 <% day = calendar.startdt
 while day <= calendar.enddt %>
-<%= "<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>" if day.cwday == calendar.first_wday %>
+<%= ("<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>".html_safe) if day.cwday == calendar.first_wday %>
 <td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
 <p class="day-num"><%= day.day %></p>
 <% calendar.events_on(day).each do |i| %>
@@ -24,7 +24,7 @@ while day <= calendar.enddt %>
   <% end %>
 <% end %>
 </td>
-<%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %>
+<%= '</tr><tr>'.html_safe if day.cwday==calendar.last_wday and day!=calendar.enddt %>
 <% day = day + 1
 end %>
 </tr>