# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301418257 -3600
# Node ID 4ed4207d81c5d82bb76bc198f77c4eaeb5d8a99f
# Parent  c73f512810a94f1e8db76921f65d5bb45a56eecb# Parent  f1a12c3b45873674f763621afdd8821267a6b48a
Merge

diff -r c73f512810a9 -r 4ed4207d81c5 app/helpers/projects_helper.rb
--- 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