Merge f442f5b into 1093312

mozilla · Dec 3, 2015 · 043b27f · 043b27f
2 parents 1093312 + f442f5b
commit 043b27f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/news/utils.py b/news/utils.py
@@ -82,8 +82,9 @@ def has_valid_api_key(request):
     # The API key could be the query parameter 'api-key' or the
     # request header 'X-api-key'.
 
-    api_key = request.REQUEST.get('api-key', None) or\
-        request.META.get('HTTP_X_API_KEY', None)
+    api_key = (request.REQUEST.get('api-key', None) or
+               request.REQUEST.get('api_key', None) or
+               request.META.get('HTTP_X_API_KEY', None))
     return APIUser.is_valid(api_key)