From 5d631d47ecc7617f22dda21de3d607893a60d453 Mon Sep 17 00:00:00 2001
From: Davide D'Agostino <d.dagostino@lipsiasoft.com>
Date: Tue, 23 Aug 2011 15:43:36 +0200
Subject: [PATCH] Fix issue #633

---
 padrino-core/lib/padrino-core/cli/base.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/padrino-core/lib/padrino-core/cli/base.rb b/padrino-core/lib/padrino-core/cli/base.rb
index 7f415d321..a183b8202 100644
--- a/padrino-core/lib/padrino-core/cli/base.rb
+++ b/padrino-core/lib/padrino-core/cli/base.rb
@@ -109,8 +109,7 @@ def prepare(task)
             help(task.to_s)
             raise SystemExit
           end
-          ENV["PADRINO_ENV"] ||= options.environment.to_s
-          ENV["RACK_ENV"] = ENV["PADRINO_ENV"] # Also set this for middleware
+          ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= options.environment.to_s
           chdir(options.chdir)
           unless File.exist?('config/boot.rb')
             puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb !!!"