Merge pull request #645 from cmenke/patch-2

taylorotwell · taylorotwell · commit daa0739c6132 · 2013-03-21T17:18:10.000-07:00
[Bugfix] Re-enable array_get to fetch "flat" array keys containing dots.
diff --git a/src/Illuminate/Support/helpers.php b/src/Illuminate/Support/helpers.php
@@ -169,6 +169,8 @@ function array_forget(&$array, $key)
 	function array_get($array, $key, $default = null)
 	{
 		if (is_null($key)) return $array;
+		
+		if (isset($array[$key])) return $array[$key];
 
 		foreach (explode('.', $key) as $segment)
 		{

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,8 @@ function array_forget(&$array, $key)`
`169`	`169`	`function array_get($array, $key, $default = null)`
`170`	`170`	`{`
`171`	`171`	`if (is_null($key)) return $array;`
	`172`	`+`
	`173`	`+ if (isset($array[$key])) return $array[$key];`
`172`	`174`
`173`	`175`	`foreach (explode('.', $key) as $segment)`
`174`	`176`	`{`