From 4baf32b166a667f26440e4f3d81cdbcedc64eaa4 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 25 Feb 2009 07:25:01 +0000 Subject: Fixing Plugin and Mailer default_url_options. Both the plugin hooks and Mailer were setting default_url_options incorrectly and causing ActionContoller::UrlWritter to cache the settings on the module (mattr_accessor) causing several url generators to fail in either the plugin hooks or the Mailer. * Replaced Mailer's use of the default_url_options accessor with the proper class method * Replaced Hook's use of the default_url_options accessor with the proper class method on the ViewListener class * Added a test to reproduce the bugs in the Mailer when a hook is registered (thanks Chaoqun Zou) #2542 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2522 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/hook.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/redmine') diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb index 2dedb78e7..7f4b6e07e 100644 --- a/lib/redmine/hook.rb +++ b/lib/redmine/hook.rb @@ -60,7 +60,6 @@ module Redmine returning [] do |response| hls = hook_listeners(hook) if hls.any? - default_url_options[:only_path] ||= true hls.each {|listener| response << listener.send(hook, context)} end end @@ -77,8 +76,9 @@ module Redmine Redmine::Hook.add_listener(child) super end + end - + # Listener class used for views hooks. # Listeners that inherit this class will include various helpers by default. class ViewListener < Listener @@ -96,6 +96,12 @@ module Redmine include ActionController::UrlWriter include ApplicationHelper + # Default to creating links using only the path. Subclasses can + # change this default as needed + def self.default_url_options + {:only_path => true } + end + # Helper method to directly render a partial using the context: # # class MyHook < Redmine::Hook::ViewListener -- cgit v1.2.3