From e1110034d1bf19c0dad11a78367036740302de39 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Thu, 8 Nov 2012 14:31:18 +0100
Subject: [PATCH] prefix env key

---
 lib/travis/api/app/helpers/respond_with.rb | 2 +-
 lib/travis/api/app/middleware/rewrite.rb   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/travis/api/app/helpers/respond_with.rb b/lib/travis/api/app/helpers/respond_with.rb
index 9fb9fdb6..f7f8cbff 100644
--- a/lib/travis/api/app/helpers/respond_with.rb
+++ b/lib/travis/api/app/helpers/respond_with.rb
@@ -7,7 +7,7 @@ class Travis::Api::App
     # course). These values will be encoded in JSON.
     module RespondWith
       def respond_with(resource, options = {})
-        options[:format] ||= env['format']
+        options[:format] ||= env['travis.format']
         result = respond(resource, options)
         result = result ? result.to_json : 404
         halt result
diff --git a/lib/travis/api/app/middleware/rewrite.rb b/lib/travis/api/app/middleware/rewrite.rb
index 6646062c..2a23b89a 100644
--- a/lib/travis/api/app/middleware/rewrite.rb
+++ b/lib/travis/api/app/middleware/rewrite.rb
@@ -24,7 +24,7 @@ class Travis::Api::App
 
         def extract_format
           env['PATH_INFO'].sub!(FORMAT, '')
-          env['format'] = $1 || accept_format
+          env['travis.format'] = $1 || accept_format
         end
 
         def rewrite_v1_repo_segment
@@ -36,7 +36,7 @@ class Travis::Api::App
         end
 
         def redirect_v1_named_repo_path
-          force_redirect("/repositories#{$1}.#{env['format']}") if request.path =~ V1_REPO_URL
+          force_redirect("/repositories#{$1}.#{env['travis.format']}") if request.path =~ V1_REPO_URL
         end
 
         def force_redirect(path)
@@ -47,11 +47,11 @@ class Travis::Api::App
         end
 
         def png?
-          env['format'] == 'png'
+          env['travis.format'] == 'png'
         end
 
         def xml?
-          env['format'] == 'xml'
+          env['travis.format'] == 'xml'
         end
 
         def v1?