From 6ec2e855535b0c81dff82641b4ec0975791a8fe1 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@managedit.ie>
Date: Thu, 10 Feb 2011 20:18:19 +0000
Subject: [PATCH] Fixes #3657 - Environments and KOHANA_ENV

Conflicts:

	application/bootstrap.php
---
 application/bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/bootstrap.php b/application/bootstrap.php
index 27462b8..d6081cd 100644
--- a/application/bootstrap.php
+++ b/application/bootstrap.php
@@ -61,9 +61,9 @@ I18n::lang('en-us');
  * Note: If you supply an invalid environment name, a PHP warning will be thrown
  * saying "Couldn't find constant Kohana::<INVALID_ENV_NAME>"
  */
-if (getenv('KOHANA_ENV') !== FALSE)
+if (isset($_SERVER['KOHANA_ENV']))
 {
-	Kohana::$environment = constant('Kohana::'.strtoupper(getenv('KOHANA_ENV')));
+	Kohana::$environment = constant('Kohana::'.strtoupper($_SERVER['KOHANA_ENV']));
 }
 
 /**