Merged r9798 to r9801 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9803 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-10 13:40:02 +00:00
parent 69709a2513
commit fe1a152e02
2 changed files with 9 additions and 6 deletions
@@ -458,9 +458,9 @@ class ApplicationController < ActionController::Base
  # Returns the API key present in the request
  def api_key_from_request
    if params[:key].present?
-      params[:key]
+      params[:key].to_s
    elsif request.headers["X-Redmine-API-Key"].present?
-      request.headers["X-Redmine-API-Key"]
+      request.headers["X-Redmine-API-Key"].to_s
    end
  end