summaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
Diffstat (limited to 'vendor')
-rw-r--r--vendor/plugins/acts_as_event/lib/acts_as_event.rb10
1 files changed, 9 insertions, 1 deletions
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