Fix issue padrino#633

skra · Aug 23, 2011 · 5d631d4 · 5d631d4
1 parent 635fdbf
commit 5d631d4
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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 !!!"