Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: d5038846e3
...
compare: 523363a54e
  • 6 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
1  .gitignore
@@ -12,3 +12,4 @@ db/schema.rb
public/javascripts/all.js
!app/views/layouts/application.*
app/views/layouts/*
+vendor/rails
View
1  app/controllers/application_controller.rb
@@ -146,6 +146,7 @@ def menu_subtree_for(tree, task)
end
def set_lang
+ params[:lang] = params[:lang].to_s # Ensure gettext gets a string!
bindtextdomain 'comas'
lang = cookies[:lang]
set_lang = params[:lang]
View
8 lib/menu_tree.rb
@@ -65,7 +65,13 @@ def to_s
def build_link
@label ||= ''
return @label if @link.nil?
- return link_to(@label, @link.html_safe)
+ # Annoying syntax change in a minor Rails version update :-/
+ begin
+ link = @link.html_safe!
+ rescue ActionView::TemplateError
+ link = @link.html_safe
+ end
+ return link_to(@label, link)
end
# We can be dirty here, as we know where all this data is coming
# from. If our menu is mallicious, there are bigger things to worry
View
1  vendor/rails

No commit comments for this range

Something went wrong with that request. Please try again.