From 760c933bd7f9cef23f5a50422a123a09f45b2389 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 18 Apr 2010 10:00:11 +0000 Subject: [PATCH] Fixes acts_as_event with a String as url option (#5343). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3681 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- vendor/plugins/acts_as_event/lib/acts_as_event.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/vendor/plugins/acts_as_event/lib/acts_as_event.rb b/vendor/plugins/acts_as_event/lib/acts_as_event.rb index 1aa7ddf01..364bb8cef 100644 --- a/vendor/plugins/acts_as_event/lib/acts_as_event.rb +++ b/vendor/plugins/acts_as_event/lib/acts_as_event.rb @@ -65,7 +65,15 @@ module Redmine def event_url(options = {}) option = event_options[:url] - (option.is_a?(Proc) ? option.call(self) : send(option)).merge(options) + if option.is_a?(Proc) + option.call(self) + elsif option.is_a?(Hash) + option.merge(options) + elsif option.is_a?(Symbol) + send(option) + else + option + end end # Returns the mail adresses of users that should be notified