From c323779dcb2c5f187c48a2b806ef08aa944002b5 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@managedit.ie>
Date: Mon, 20 Sep 2010 23:28:44 +0100
Subject: [PATCH] Moving $_ENV['KOHANA_ENV'] check above Kohana::init() call.
 Refs #3254

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

diff --git a/application/bootstrap.php b/application/bootstrap.php
index 3e5492d..abbf3ec 100644
--- a/application/bootstrap.php
+++ b/application/bootstrap.php
@@ -36,6 +36,15 @@ ini_set('unserialize_callback_func', 'spl_autoload_call');
 
 //-- Configuration and initialization -----------------------------------------
 
+/**
+ * Set Kohana::$environment if $_ENV['KOHANA_ENV'] has been supplied.
+ * 
+ */
+if (isset($_ENV['KOHANA_ENV']))
+{
+	Kohana::$environment = $_ENV['KOHANA_ENV'];
+}
+
 /**
  * Initialize Kohana, setting the default options.
  *
@@ -53,15 +62,6 @@ Kohana::init(array(
 	'base_url'   => '/',
 ));
 
-/**
- * Set Kohana::$environment if $_ENV['KOHANA_ENV'] has been supplied.
- * 
- */
-if (isset($_ENV['KOHANA_ENV']))
-{
-	Kohana::$environment = $_ENV['KOHANA_ENV'];
-}
-
 /**
  * Attach the file write to logging. Multiple writers are supported.
  */