Merge branch 'develop' into feature/http-foundation

2012-03-29 22:13:13 -05:00
parent 9e8acd1eda 3e0d468470
commit 6234905e4c
9 changed files with 151 additions and 17 deletions
--- a/laravel/input.php
+++ b/laravel/input.php
@@ -120,7 +120,7 @@ class Input {
 	 */
 	public static function except($keys)
 	{
-		return array_diff_key(static::get(), array_flip($keys));
+		return array_diff_key(static::get(), array_flip((array) $keys));
 	}

 	/**