Browse Source

Avoid unnecessary Hash::merge() call.

ADmad 11 years ago
parent
commit
df3148a936
1 changed files with 5 additions and 7 deletions
  1. 5 7
      src/Network/Request.php

+ 5 - 7
src/Network/Request.php

@@ -156,13 +156,11 @@ class Request implements \ArrayAccess {
  */
 	public static function createFromGlobals() {
 		list($base, $webroot) = static::_base();
-		$sessionConfig = Hash::merge(
-			[
-				'defaults' => 'php',
-				'cookiePath' => $base ?: '/'
-			],
-			(array)Configure::read('Session')
-		);
+		$sessionConfig = (array)Configure::read('Session') + [
+			'defaults' => 'php',
+			'cookiePath' => $base ?: '/'
+		];
+
 		$config = array(
 			'query' => $_GET,
 			'post' => $_POST,