Merged r10715 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10724 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/context_menus_helper.rb b/app/helpers/context_menus_helper.rb
index 15e670c7838f5b8e87617f6e19fb762068dcb19e..940f4ce3115dc3eacb0f4589808b5df38b0c93ca 100644 (file)
--- a/app/helpers/context_menus_helper.rb
+++ b/app/helpers/context_menus_helper.rb
@@ -26,8 +26,8 @@ module ContextMenusHelper
     end
     if options.delete(:disabled)
       options.delete(:method)
-      options.delete(:confirm)
-      options.delete(:onclick)
+      options.delete(:data)
+      options[:onclick] = 'return false;'
       options[:class] << ' disabled'
       url = '#'
     end