Diff
Modified: trunk/app/models/pack.rb (2279 => 2280)
--- trunk/app/models/pack.rb 2009-10-07 01:08:49 UTC (rev 2279)
+++ trunk/app/models/pack.rb 2009-10-07 01:15:48 UTC (rev 2280)
@@ -671,7 +671,7 @@
if item.comment.nil? || item.comment.blank?
return "Comment: " + (html_required ? "<span class='none_text'>none</span>" : "none")
else
- return "Comment: " + (html_required ? "<div class='comment_text'>#{simple_format(sanitize(item.comment))}</div>" : ("\n | " + item.comment.gsub(/\n/, "\n | ")))
+ return "Comment: " + (html_required ? "<div class='comment_text'>#{white_list(simple_format(item.comment))}</div>" : ("\n | " + item.comment.gsub(/\n/, "\n | ")))
end
end
Modified: trunk/app/views/friendships/show.rhtml (2279 => 2280)
--- trunk/app/views/friendships/show.rhtml 2009-10-07 01:08:49 UTC (rev 2279)
+++ trunk/app/views/friendships/show.rhtml 2009-10-07 01:15:48 UTC (rev 2280)
@@ -40,7 +40,7 @@
</p>
<div style="padding: 0.3em 1em; border: 1px dotted #999999; background-color: #FFFFFF;">
<p style="font-size: 93%; text-align: center;">
- <%= simple_format(sanitize(@friendship.message)) -%>
+ <%= white_list(simple_format(@friendship.message)) -%>
</p>
</div>
<% end %>
Modified: trunk/app/views/memberships/show.rhtml (2279 => 2280)
--- trunk/app/views/memberships/show.rhtml 2009-10-07 01:08:49 UTC (rev 2279)
+++ trunk/app/views/memberships/show.rhtml 2009-10-07 01:15:48 UTC (rev 2280)
@@ -65,7 +65,7 @@
<div style="padding: 0.3em 1em; border: 1px dotted #999999; background-color: #FFFFFF;">
<p style="font-size: 93%; text-align: center;">
- <%= simple_format(sanitize(@membership.message)) -%>
+ <%= white_list(simple_format(@membership.message)) -%>
</p>
</div>
<% end %>
Modified: trunk/app/views/profiles/_profile.rhtml (2279 => 2280)
--- trunk/app/views/profiles/_profile.rhtml 2009-10-07 01:08:49 UTC (rev 2279)
+++ trunk/app/views/profiles/_profile.rhtml 2009-10-07 01:15:48 UTC (rev 2280)
@@ -22,7 +22,7 @@
<p>
<b>Other contact details:</b>
</p>
- <%= simple_format(sanitize(profile.contact_details)) %>
+ <%= white_list(simple_format(profile.contact_details)) %>
<% end %>
<% unless profile.location.nil? or profile.location.empty? %>
@@ -50,13 +50,13 @@
<p>
<b>Organisation(s):</b>
</p>
- <%= simple_format(sanitize(profile.organisations)) %>
+ <%= white_list(simple_format(profile.organisations)) %>
<% end %>
<% unless profile.interests.nil? or profile.interests.empty? %>
<p>
<b>Interests:</b>
</p>
- <%= simple_format(sanitize(profile.interests)) %>
+ <%= white_list(simple_format(profile.interests)) %>
<% end %>
Modified: trunk/app/views/users/show.rhtml (2279 => 2280)
--- trunk/app/views/users/show.rhtml 2009-10-07 01:08:49 UTC (rev 2279)
+++ trunk/app/views/users/show.rhtml 2009-10-07 01:15:48 UTC (rev 2280)
@@ -291,7 +291,7 @@
<b>Other contact details:</b>
</p>
<% unless @user.profile.contact_details.nil? or @user.profile.contact_details.empty? %>
- <%= simple_format(sanitize(@user.profile.contact_details)) %>
+ <%= white_list(simple_format(@user.profile.contact_details)) %>
<% else %>
<%= none_text %>
<% end %>
@@ -300,7 +300,7 @@
<b>Interests:</b>
</p>
<% unless @user.profile.interests.nil? or @user.profile.interests.empty? %>
- <%= simple_format(sanitize(@user.profile.interests)) %>
+ <%= white_list(simple_format(@user.profile.interests)) %>
<% else %>
<%= none_text %>
<% end %>
@@ -331,7 +331,7 @@
<b>Organisation(s):</b>
</p>
<% unless @user.profile.organisations.nil? or @user.profile.organisations.empty? %>
- <%= simple_format(sanitize(@user.profile.organisations)) %>
+ <%= white_list(simple_format(@user.profile.organisations)) %>
<% else %>
<%= none_text %>
<% end %>