From aef8f2598f100ca795091133b921cc9e9759cc39 Mon Sep 17 00:00:00 2001 From: Seb Bacon Date: Wed, 30 May 2012 13:24:07 +0100 Subject: Explicitly load monkeypatches etc with full path, so we can support multiple themes living side-by-side (or at least, support one theme overriding the behaviour of another in a predictable manner) --- lib/alavetelitheme.rb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'lib/alavetelitheme.rb') diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb index 2ba63ce..b4f93a5 100644 --- a/lib/alavetelitheme.rb +++ b/lib/alavetelitheme.rb @@ -16,12 +16,9 @@ end end # Monkey patch app code -require 'controller_patches.rb' -require 'model_patches.rb' -require 'patch_mailer_paths.rb' - -# Extend routes -require 'config/custom-routes.rb' - -# Plug theme-specific locale strings -require 'gettext_setup.rb' +for patch in ['controller_patches.rb', + 'model_patches.rb', + 'config/custom-routes.rb', + 'gettext_setup.rb'] + require File.expand_path "../#{patch}", __FILE__ +end -- cgit v1.2.3