From 863d780ad0a6c89a8d820ea516d4aa84f277b468 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Wed, 13 Aug 2014 18:12:47 +0200
Subject: [PATCH] make Tracks run on subdir again

---
 config.ru             | 5 ++++-
 config/application.rb | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/config.ru b/config.ru
index 5bc2a619..f76cb138 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,7 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-run Rails.application
+
+map Tracksapp::Application.config.relative_url_root || "/" do
+  run Rails.application
+end
diff --git a/config/application.rb b/config/application.rb
index 76a0d471..1620cffe 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -29,7 +29,7 @@ module Tracksapp
     # config.i18n.default_locale = :de
 
     # configure Tracks to handle deployment in a subdir
-    config.action_controller.relative_url_root = SITE_CONFIG['subdir'] if SITE_CONFIG['subdir']
+    config.relative_url_root = SITE_CONFIG['subdir'] if SITE_CONFIG['subdir']
     
     # allow onenote:// and message:// as protocols for urls
     config.action_view.sanitized_allowed_protocols = 'onenote', 'message'