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

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
51c8f314 · Jean-Philippe Lang · 0d938dff · 51c8f314 · 51c8f314
Commit 51c8f314 authored Apr 30, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

projects_controller_test.rb test/functional/projects_controller_test.rb +3 -0

acts_as_event.rb vendor/plugins/acts_as_event/lib/acts_as_event.rb +2 -2

No files found.
--- 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

--- 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