aboutsummaryrefslogtreecommitdiffstats
path: root/railties/builtin/rails_info/rails
diff options
context:
space:
mode:
Diffstat (limited to 'railties/builtin/rails_info/rails')
-rw-r--r--railties/builtin/rails_info/rails/info.rb4
-rw-r--r--railties/builtin/rails_info/rails/info_controller.rb16
2 files changed, 9 insertions, 11 deletions
diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
index 9ded9e0649..5f8e01c1c3 100644
--- a/railties/builtin/rails_info/rails/info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -51,8 +51,8 @@ module Rails
def to_html
returning table = '<table>' do
properties.each do |(name, value)|
- table << %(<tr><td class="name">#{CGI.escapeHTML(name)}</td>)
- table << %(<td class="value">#{CGI.escapeHTML(value)}</td></tr>)
+ table << %(<tr><td class="name">#{CGI.escapeHTML(name.to_s)}</td>)
+ table << %(<td class="value">#{CGI.escapeHTML(value.to_s)}</td></tr>)
end
table << '</table>'
end
diff --git a/railties/builtin/rails_info/rails/info_controller.rb b/railties/builtin/rails_info/rails/info_controller.rb
index 7534447043..39f8b1f120 100644
--- a/railties/builtin/rails_info/rails/info_controller.rb
+++ b/railties/builtin/rails_info/rails/info_controller.rb
@@ -1,11 +1,9 @@
-module Rails
- class InfoController < ActionController::Base
- def properties
- if local_request?
- render :inline => Rails::Info.to_html
- else
- render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => 500
- end
+class Rails::InfoController < ActionController::Base
+ def properties
+ if local_request?
+ render :inline => Rails::Info.to_html
+ else
+ render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => 500
end
end
-end \ No newline at end of file
+end