diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index e3a020818..044ccfb77 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -56,7 +56,10 @@ module ProjectsHelper
s = ''
if projects.any?
ancestors = []
+ original_project = @project
projects.each do |project|
+ # set the project environment to please macros.
+ @project = project
if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
s << "
\n"
else
@@ -75,6 +78,7 @@ module ProjectsHelper
ancestors << project
end
s << ("
\n" * ancestors.size)
+ @project = original_project
end
s
end
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index 279c35421..a0ada7cce 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -18,11 +18,13 @@
<%=l(:label_project_latest)%>
<% for project in @projects %>
+ <% @project = project %>
-
<%= link_to h(project.name), :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
<%= textilizable project.short_description, :project => project %>
<% end %>
+ <% @project = nil %>
<% end %>