Fixes URLs in atom feeds broken by r3681 (#5403).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3703 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 10:45:21 +00:00
parent 0d938dff59
commit 51c8f3143c
2 changed files with 5 additions and 2 deletions
@@ -66,11 +66,11 @@ module Redmine
        def event_url(options = {})
          option = event_options[:url]
          if option.is_a?(Proc)
-            option.call(self)
+            option.call(self).merge(options)
          elsif option.is_a?(Hash)
            option.merge(options)
          elsif option.is_a?(Symbol)
-            send(option)
+            send(option).merge(options)
          else
            option
          end