Mercurial > hg > soundsoftware-site
changeset 331:4ed4207d81c5 live
Merge
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Tue, 29 Mar 2011 18:04:17 +0100 |
parents | c73f512810a9 (current diff) f1a12c3b4587 (diff) |
children | 9e5fc43c12a6 |
files | |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/app/helpers/projects_helper.rb Tue Mar 29 11:42:44 2011 +0100 +++ b/app/helpers/projects_helper.rb Tue Mar 29 18:04:17 2011 +0100 @@ -127,7 +127,8 @@ else s << " <span class='private'>" << l("field_is_private") << "</span>" end - s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank? + desc = textilizable(project.short_description, :project => project).gsub(/<[^>]+>/, '') + s << "<div class='wiki description'>#{desc}</div>" unless project.description.blank? s << "</div>\n" ancestors << project end