From 91cacf2f8923b9ce33335ad4baa90b8a836b52df Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 16 Aug 2009 12:40:01 +0300
Subject: [PATCH] Changed the environment property name from "env" to
 "environment" in ActiveEnvironment.

---
 config/environment.php                | 2 +-
 vendor/zynapse/action_environment.php | 8 ++++----
 vendor/zynapse/zynapse.php            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/environment.php b/config/environment.php
index 691caac..c398e4a 100644
--- a/config/environment.php
+++ b/config/environment.php
@@ -12,7 +12,7 @@
 # configurations.
 #
 # ( development | test | staging | production )
-$this->env = 'development';
+$this->environment = 'development';
 
 
 # Default server display mode - Overridden by host
diff --git a/vendor/zynapse/action_environment.php b/vendor/zynapse/action_environment.php
index 3b4f415..239f99f 100644
--- a/vendor/zynapse/action_environment.php
+++ b/vendor/zynapse/action_environment.php
@@ -36,7 +36,7 @@ class ActionEnvironment {
 	public
 	
 		# Main
-		$env,
+		$environment,
 		$mode,
 		$root,
 		
@@ -67,7 +67,7 @@ class ActionEnvironment {
 		require_once(ZNAP_CONFIG . "/hosts.php");		
 		$host = $this->match_to_host($hosts);
 		if ( !empty($host) ) {
-			if ( !empty($host['environment']) ) $this->env = $host['environment'];
+			if ( !empty($host['environment']) ) $this->environment = $host['environment'];
 			if ( !empty($host['mode']) ) $this->mode = $host['mode'];
 			if ( !empty($host['root']) ) {
 				if ( !empty($_SERVER['REQUEST_URI']) ) $_SERVER['REQUEST_URI'] = '/'.$host['root'].$_SERVER['REQUEST_URI'];
@@ -77,7 +77,7 @@ class ActionEnvironment {
 	}
 	
 	function load_environment_specific_file () {
-		require_once(ZNAP_CONFIG . "/environments/". $this->env . ".php");
+		require_once(ZNAP_CONFIG . "/environments/". $this->environment . ".php");
 	}
 	
 	function set_include_paths () {
@@ -98,7 +98,7 @@ class ActionEnvironment {
 	
 	function define_constants () {
 		if ( !defined("ZNAP_ENV") ) {
-			define("ZNAP_ENV", $this->env);
+			define("ZNAP_ENV", $this->environment);
 		}
 		if ( !defined("ZNAP_MODE") ) {
 			define("ZNAP_MODE", $this->mode);
diff --git a/vendor/zynapse/zynapse.php b/vendor/zynapse/zynapse.php
index 30382e3..b50d091 100644
--- a/vendor/zynapse/zynapse.php
+++ b/vendor/zynapse/zynapse.php
@@ -55,7 +55,7 @@ class Zynapse {
 		self::$base->env =& self::$env;
 		
 		echo "hello world<br />\n";
-		echo self::$env->env;
+		echo self::$env->environment;
 	}
 	
 }