0
@@ -1,5 +1,7 @@
0
 * SVN *
0
 
0
+* tweak mephisto_init to support the new ActionController::Dispatcher class.  [Rob Anderton]
0
+
0
 * Don't generate an article event for unversioned changes. [Marcus Brito]
0
 
0
 * Switch to will_paginate plugin [Mislav]

0
@@ -132,7 +132,7 @@ class MephistoController < ApplicationController
0
       show_404 and return unless @article || find_article
0
       Mephisto::Liquid::CommentForm.article = @article
0
       @article = @article.to_liquid(:mode => :single)
0
-      render_liquid_template_for(:single, assigns.merge('articles' => [@article], 'article' => @article))
0
+      render_liquid_template_for(:single, assigns.update('articles' => [@article], 'article' => @article))
0
     end
0
     alias dispatch_single show_article_with
0
 end

0
@@ -20,6 +20,9 @@ Rails::Initializer.run do |config|
0
   config.frameworks -= [ :active_resource ]
0
 
0
   config.load_paths += %W( #{RAILS_ROOT}/app/cachers #{RAILS_ROOT}/app/drops #{RAILS_ROOT}/app/filters )
0
+  
0
+  # NFI why this is here.  find and eradicate the bug.
0
+  config.load_paths += %W( #{RAILS_ROOT}/vendor/rails/actionwebservice/lib )
0
 
0
   # Force all environments to use the same logger level 
0
   # (by default production uses :info, the others :debug)

0
@@ -1,33 +1,33 @@
0
 # this is for standard library loading and configurationg.  All the hardcore monkey patching is in the mephisto plugin.
0
 require 'tzinfo'
0
 require 'zip/zipfilesystem'
0
-require 'dispatcher'
0
+require 'action_controller/dispatcher'
0
 require 'coderay'
0
 require 'ruby_pants'
0
 require 'xmlrpc_patch'
0
 
0
 ActiveRecord::Base.observers = [:article_observer, :comment_observer]
0
 
0
-class << Dispatcher
0
-  def register_liquid_tags
0
+class ActionController::Dispatcher
0
+  def self.register_liquid_tags
0
     Mephisto.liquid_filters.each { |mod| Liquid::Template.register_filter mod }
0
     Mephisto.liquid_tags.each { |name, klass| Liquid::Template.register_tag name, klass }
0
   end
0
   
0
-  def reset_application_with_plugins!
0
-    returning reset_application_without_plugins! do
0
+  def cleanup_application_with_plugins(force = false)
0
+    returning cleanup_application_without_plugins(force) do
0
       register_liquid_tags
0
     end
0
   end
0
   
0
-  alias_method_chain :reset_application!, :plugins
0
+  alias_method_chain :cleanup_application, :plugins
0
 end
0
 
0
 module Liquid
0
   AllowedVariableCharacters = /[a-zA-Z_.-]/ unless Liquid.const_defined?(:AllowedVariableCharacters)
0
 end
0
 
0
-Dispatcher.register_liquid_tags
0
+ActionController::Dispatcher.register_liquid_tags
0
 
0
 WhiteListHelper.tags.merge %w(table tr td)
0