diff options
| -rw-r--r-- | app/helpers/application_helper.rb | 5 | ||||
| -rw-r--r-- | test/functional/issues_controller_test.rb | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a2c252f83..aa37ff377 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -437,10 +437,9 @@ module ApplicationHelper def html_title(*args) if args.empty? - title = [] + title = @html_title || [] title << @project.name if @project - title += @html_title if @html_title - title << Setting.app_title + title << Setting.app_title unless Setting.app_title == title.last title.select {|t| !t.blank? }.join(' - ') else @html_title ||= [] diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index b17e2aabe..0b73c255d 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -480,6 +480,8 @@ class IssuesControllerTest < ActionController::TestCase :descendant => { :tag => 'fieldset', :child => { :tag => 'legend', :content => /Notes/ } } + assert_tag :tag => 'title', + :content => "Bug #1: Can't print recipes - eCookbook - Redmine" end def test_show_by_manager |