summaryrefslogtreecommitdiffstats
path: root/app/views/common
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-12-21 03:40:06 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-12-21 03:40:06 +0000
commit576d333c2c58cd44bb4f3bac9ffabf58445ead5f (patch)
treee5896a17c7b02c986b895547fd2f3f1288072ce6 /app/views/common
parent427aca9f90071c6e258c7753281bcfb764d3985b (diff)
downloadredmine-576d333c2c58cd44bb4f3bac9ffabf58445ead5f.tar.gz
redmine-576d333c2c58cd44bb4f3bac9ffabf58445ead5f.zip
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
Diffstat (limited to 'app/views/common')
-rw-r--r--app/views/common/_calendar.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index 147c49b2c..7951b68ce 100644
--- 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>