diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-20 19:17:20 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-20 19:17:20 +0000 |
| commit | bba304ef390789627052d235c1f2bfd2227e4f2c (patch) | |
| tree | 5f3676bb79cb617bc87481cccaf34ac19f87a0ad /app/helpers | |
| parent | 7df9f8d31edb2b8188929afc17555a3bec898ad7 (diff) | |
| download | redmine-bba304ef390789627052d235c1f2bfd2227e4f2c.tar.gz redmine-bba304ef390789627052d235c1f2bfd2227e4f2c.zip | |
Fixed that the sidebar may be displayed empty (#15414).
git-svn-id: http://svn.redmine.org/redmine/trunk@12310 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2b37ad312..7bee2117e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1173,18 +1173,13 @@ module ApplicationHelper super sources, options end - def content_for(name, content = nil, &block) - @has_content ||= {} - @has_content[name] = true - super(name, content, &block) - end - + # TODO: remove this in 2.5.0 def has_content?(name) - (@has_content && @has_content[name]) || false + content_for?(name) end def sidebar_content? - has_content?(:sidebar) || view_layouts_base_sidebar_hook_response.present? + content_for?(:sidebar) || view_layouts_base_sidebar_hook_response.present? end def view_layouts_base_sidebar_hook_response |