Merge pull request #10489 from pauliuspetronis/2.0.x

[2.0.x] Fix bug #10484
phalcon · Jun 8, 2015 · 3c7b039 · 3c7b039
2 parents f57be5f + 4f956b4
commit 3c7b039
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/phalcon/db/adapter/pdo.zep b/phalcon/db/adapter/pdo.zep
@@ -119,6 +119,16 @@ abstract class Pdo extends Adapter
 			let options = [];
 		}
 
+		/**
+		 * Check if the connection must be persistent
+		 */
+		if fetch persistent, descriptor["persistent"] {
+			if persistent {
+				let options[\Pdo::ATTR_PERSISTENT] = true;
+			}
+			unset descriptor["persistent"];
+		}
+
 		/**
 		 * Check if the user has defined a custom dsn
 		 */
@@ -132,16 +142,6 @@ abstract class Pdo extends Adapter
 
 		let options[\Pdo::ATTR_ERRMODE] = \Pdo::ERRMODE_EXCEPTION;
 
-		/**
-		 * Check if the connection must be persistent
-		 */
-		if fetch persistent, descriptor["persistent"] {
-			if persistent {
-				let options[\Pdo::ATTR_PERSISTENT] = true;
-			}
-			unset descriptor["persistent"];
-		}
-
 		/**
 		 * Create the connection using PDO
 		 */