Merged r22829 from trunk to 5.0-stable (#40610).

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22832 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/projects_queries_helper.rb b/app/helpers/projects_queries_helper.rb
index 3319576513c240dec2a97784a95e7aaf7693bd3c..dc540a432b339ac44def6d34de42be9a9792be15 100644 (file)
--- a/app/helpers/projects_queries_helper.rb
+++ b/app/helpers/projects_queries_helper.rb
@@ -27,7 +27,13 @@ module ProjectsQueriesHelper
           (tag.span(class: 'icon icon-user my-project', title: l(:label_my_projects)) if User.current.member_of?(item)) +
           (tag.span(class: 'icon icon-bookmarked-project', title: l(:label_my_bookmarks)) if User.current.bookmarked_project_ids.include?(item.id))
       when :short_description
-        item.description? ? content_tag('div', textilizable(item, :short_description), :class => "wiki") : ''
+        if item.description?
+          # Sets :inline_attachments to false to avoid performance issues
+          # caused by unnecessary loading of attachments
+          content_tag('div', textilizable(item, :short_description, :inline_attachments => false), :class => 'wiki')
+        else
+          ''
+        end
       when :homepage
         item.homepage? ? content_tag('div', textilizable(item, :homepage), :class => "wiki") : ''
       when :status