Merge remote-tracking branch 'jfirebaugh/562'

[rails.git] / app / helpers / title_helper.rb

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index 181c12af849e8e97bb244dc845c5c7b044663da7..da4ad8967e3c72616a7232041b319d2aab49af6d 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,11 +1,6 @@
 module TitleHelper
   def set_title(title = false)
-    if title
-        title = t('layouts.project_name.title') + ' | ' + title
-    else
-        title = t('layouts.project_name.title')
-    end
-    response.headers["X-Page-Title"] = title 
+    response.headers["X-Page-Title"] = t('layouts.project_name.title') + (title ? ' | ' + title : '')
     @title = title
   end
 end