Merged r11518 from trunk (#8529).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11570 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 10:19:39 +00:00
parent 4413e0e52e
commit f4def66c58
2 changed files with 13 additions and 0 deletions
@@ -6,6 +6,7 @@ api.user do
  api.mail       @user.mail if User.current.admin? || !@user.pref.hide_mail
  api.created_on @user.created_on
  api.last_login_on @user.last_login_on
+  api.api_key    @user.api_key if User.current.admin? || (User.current == @user)

  render_api_custom_values @user.visible_custom_field_values, api