site title now rendering from site info with page title

app/helpers/application_helper.rb

@@ -31,6 +31,19 @@ module ApplicationHelper
 		html.html_safe
 	end
 
+	def render_site_title
+		site = Site.first
+		title = site.title rescue ""
+		if site.title_always_on
+			if !params[:slug].nil?
+				temp_title = params[:slug].sub("-#{params[:uid]}","")
+				temp_title = temp_title.gsub("-"," ")
+				title = "#{temp_title} | #{title}"
+			end
+		end
+		title
+	end
+
 	def render_footer
 		site = Site.first
 		footer_file = File.join('../templates', "#{@key}", "/home/footer.html.erb")