From 4549f1ec35339a777cb704f2d216ee63d55f8d13 Mon Sep 17 00:00:00 2001
From: Chuck Heintzelman <chuckh@gmail.com>
Date: Tue, 7 May 2013 10:53:09 -0700
Subject: [PATCH] Changed environment config from array_merge() to
 array_replace_recursive()

---
 src/Illuminate/Config/FileLoader.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Config/FileLoader.php b/src/Illuminate/Config/FileLoader.php
index c367d52edad7..8314e9b0dafe 100644
--- a/src/Illuminate/Config/FileLoader.php
+++ b/src/Illuminate/Config/FileLoader.php
@@ -84,7 +84,7 @@ public function load($environment, $group, $namespace = null)
 
 		if ($this->files->exists($file))
 		{
-			$items = array_merge($items, $this->files->getRequire($file));
+			$items = array_replace_recursive($items, $this->files->getRequire($file));
 		}
 
 		return $items;
@@ -207,7 +207,7 @@ public function addNamespace($namespace, $hint)
 	{
 		$this->hints[$namespace] = $hint;
 	}
-	
+
 	/**
 	 * Returns all registered namespaces with the config
 	 * loader.