Applied Dave Shenk's fix for 2.1 compatibility (http://code.google.com/p/rails-multisite/issues/detail?id=4)

Author: gtd

CHANGELOG

@@ -0,0 +1,7 @@
+*rails2.1.x tag*
+
+* Apply Dave Shenk's fix for 2.1 internals.  Untested!
+
+*rails2.0.x tag*
+
+* Moved repository to Github

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Gabe da Silveira, based on code from theme_support by Matt McCray, based on code from Typo by Tobias Luetke
+Copyright (c) 2007-2009 Gabe da Silveira, based on code from theme_support by Matt McCray, based on code from Typo by Tobias Luetke
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README

@@ -6,8 +6,7 @@ The essential functionality of the plugin is to add a specific site's views to t
 
 == Requirements
 
-* This plugin is tested in Rails 2.0.2.
-* Template caching must be disabled (this includes both cache_template_loading and cache_template_extensions action_view config options)
+* This plugin is tested in Rails 2.0.2.  Updates for Rails 2.1 and 2.2 (see tags) have been submitted but are untested by me.
 
 == Differences from theme_support 
 
@@ -54,13 +53,4 @@ You can also defer the theme lookup to a controller method:
 
 
 Note: By setting the site in the ApplicationController you can set 
-the site for the whole application.
-
-== Changelog
-
-  1.0.0 - Initial release
-
-
----
-Copyright (c) 2007-2008 Gabe da Silveira, based on code from theme_support by Matt McCray, based on code from Typo by Tobias Luetke 
-released under the MIT license
+the site for the whole application.

lib/patches/actioncontroller_ex.rb

@@ -34,11 +34,9 @@ def current_site(passed_site=nil)
   protected
   def add_multisite_path
     if current_site
-      raise "Multisite plugin is incompatible with template caching.  You must set config.action_view.cache_template_loading to false in your environment." if ActionView::Base.cache_template_loading
-      raise "Multisite plugin is incompatible with template extension caching.  You must set config.action_view.cache_template_extensions to false in your environment." if ActionView::Base.cache_template_extensions
       new_path = File.join(RAILS_ROOT, 'sites', @active_site, 'views')
-      @template.prepend_view_path(new_path)
-      logger.info "  Template View Paths: #{@template.view_paths.inspect}"
+      self.prepend_view_path(new_path)
+      logger.info "  Template View Paths: #{self.view_paths.inspect}"
     end
     return true
   end