# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301418416 -3600
# Node ID 9e5fc43c12a65836918b6586467ac8facb7d0dc7
# Parent  4ed4207d81c5d82bb76bc198f77c4eaeb5d8a99f# Parent  e665cc1fdf07930dd02d12b5c279dc857e8ed696
Merge

diff -r 4ed4207d81c5 -r 9e5fc43c12a6 app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb	Tue Mar 29 18:04:17 2011 +0100
+++ b/app/helpers/projects_helper.rb	Tue Mar 29 18:06:56 2011 +0100
@@ -201,7 +201,7 @@
     s << "</div>"
     unless project.description.blank?
       s << "<div class='wiki description'>"
-      s << textilizable(project.short_description, :project => project)
+      s << textilizable(project.short_description, :project => project).gsub(/<[^>]+>/, '')
       s << "</div>"
     end