summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-12-26 22:26:27 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-12-26 22:26:27 +0000
commit38843eb7aa31922418b6cc806fbd0ec145171bc3 (patch)
tree7b9707fe3b3ece49d2cfa7123b23a14aca50bb63 /lib
parenteb931d49988afeeede1bc6f7e688c6eef573b2de (diff)
downloadredmine-38843eb7aa31922418b6cc806fbd0ec145171bc3.tar.gz
redmine-38843eb7aa31922418b6cc806fbd0ec145171bc3.zip
Missing html_safe.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8390 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/menu_manager.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index b88e6fa2f..bf0ac127c 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -112,7 +112,7 @@ module Redmine
html << render_single_menu_node(node, caption, url, selected)
# Standard children
- standard_children_list = "".tap do |child_html|
+ standard_children_list = "".html_safe.tap do |child_html|
node.children.each do |child|
child_html << render_menu_node(child, project)
end
@@ -126,14 +126,14 @@ module Redmine
html << '</li>'
end
- return html.join("\n")
+ return html.join("\n").html_safe
end
# Returns a list of unattached children menu items
def render_unattached_children_menu(node, project)
return nil unless node.child_menus
- "".tap do |child_html|
+ "".html_safe.tap do |child_html|
unattached_children = node.child_menus.call(project)
# Tree nodes support #each so we need to do object detection
if unattached_children.is_a? Array