Stage 1 complete: Rails 2.3.5 to Rails 3.2.22.5 upgrade

- Converted plugins to gems (Gemfile)
- Updated config structure (application.rb, boot.rb, environment.rb)
- Converted routes to Rails 3 DSL
- Converted named_scope to scope throughout models
- Converted find(:all, :conditions) to where() chains
- Fixed has_many :order to use ordering scope
- Updated session store and secret token configuration
- Fixed exception_notification middleware configuration
- Patched Ruby 2.4 / Rails 3.2 incompatibilities:
  - Integer/Float duration arithmetic (ActiveSupport)
  - Arel visit_Integer for PostgreSQL adapter
  - create_database String/Integer coercion
  - ActionController consider_all_requests_local
- Migrated taggings schema for acts-as-taggable-on
- Replaced dynamic_form gem with custom form_error_messages helper
- Fixed Rails 3 block helper syntax (form_for, form_tag, fields_for)
- Fixed admin layout yield
- Updated test suite for Rails 3 APIs

1 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
index c62b726..4248239 100644
--- a/app/controllers/content_controller.rb
+++ b/app/controllers/content_controller.rb
@@ -20,7 +20,7 @@ class ContentController < ApplicationController
       )
     else
       render(
-        :file => File.join(RAILS_ROOT, 'public', '404.html'),
+        :file => Rails.root.join('public', '404.html'),
         :status => 404
       )
     end
@@ -38,7 +38,7 @@ class ContentController < ApplicationController
 
   private
     def find_page
-      path = params[:page_path].join('/')
+      path = params[:page_path].is_a?(Array) ? params[:page_path].join('/') : params[:page_path]
       if path =~ /^[a-zA-Z\:\/\/\.\-\d_]+$/
         @page = Node.find_page(path)
       else