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

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index c23bc17b22fb363aa2dee022d438e1308ba3f21c..ded7b8b1bbbb1e018226fe163ca6393250fbed7a 100644 (file)
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -447,6 +447,9 @@ class ProjectsControllerTest < ActionController::TestCase
     get :activity, :format => 'atom'
     assert_response :success
     assert_template 'common/feed.atom.rxml'
+    assert_tag :tag => 'entry', :child => {
+      :tag => 'link',
+      :attributes => {:href => 'http://test.host/issues/11'}}
   end
   
   def test_archive

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 364bb8cef5fa8d1dd1d4778d43092ab0e1cef764..07d1dab968d11d05b63a2fa50756c09fe8ca5785 100644 (file)
--- a/vendor/plugins/acts_as_event/lib/acts_as_event.rb
+++ b/vendor/plugins/acts_as_event/lib/acts_as_event.rb
@@ -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