Browse Source

Only unset the passed DSN url key if parse_url succeeds

Jose Diaz-Gonzalez 11 years ago
parent
commit
608d253ad2
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/Core/StaticConfigTrait.php

+ 1 - 1
src/Core/StaticConfigTrait.php

@@ -174,7 +174,6 @@ trait StaticConfigTrait {
 
 		$driver = null;
 		$dsn = $config['url'];
-		unset($config['url']);
 
 		if (preg_match("/^([\w\\\]+)/", $dsn, $matches)) {
 			$scheme = explode('\\', $matches[1]);
@@ -215,6 +214,7 @@ trait StaticConfigTrait {
 			$parsed['password'] = $parsed['pass'];
 		}
 
+		unset($config['url']);
 		$config = array_merge($config, $parsed, $queryArgs);
 		unset($config['user'], $config['pass'], $config['scheme']);