Merge branch 'rails3' into rails3_stable

Victor Costa
2 parents 3192fbdc 5d152dc4
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/helpers/application_helper.rb
@@ -671,7 +671,7 @@ module ApplicationHelper
  
   def theme_javascript_ng
     script = File.join(theme_path, 'theme.js')
-    if File.exists?(Rails.root.join('public', script))
+    if File.join(Rails.root, 'public', script)
       javascript_include_tag script
     else
       nil
...	...	@@ -671,7 +671,7 @@ module ApplicationHelper
671	671
672	672	def theme_javascript_ng
673	673	script = File.join(theme_path, 'theme.js')
674		- if File.exists?(Rails.root.join('public', script))
	674	+ if File.join(Rails.root, 'public', script)
675	675	javascript_include_tag script
676	676	else
677	677	nil
...	...