Merge pull request #66 from mmonguilod/master

j0k3r · j0k3r · commit 03b76a0a800e · 2014-09-12T10:56:16.000+02:00
Fix #65: Add again Propel from sfDatabaseSessionStorage
diff --git a/lib/storage/sfDatabaseSessionStorage.class.php b/lib/storage/sfDatabaseSessionStorage.class.php
@@ -101,7 +101,11 @@ public function sessionOpen($path = null, $name = null)
 
     // get the database and connection
     $databaseClass = get_class($database);
-    if ($databaseClass == 'sfDoctrineDatabase')
+    if ($databaseClass == 'sfPropelDatabase')
+    {    
+      $this->db = Propel::getConnection($database->getParameter('name'));    
+    }    
+    elseif($databaseClass == 'sfDoctrineDatabase')
     {
       $this->db = $database->getConnection();
     }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,11 @@ public function sessionOpen($path = null, $name = null)`
`101`	`101`
`102`	`102`	`// get the database and connection`
`103`	`103`	`$databaseClass = get_class($database);`
`104`		`- if ($databaseClass == 'sfDoctrineDatabase')`
	`104`	`+ if ($databaseClass == 'sfPropelDatabase')`
	`105`	`+ {`
	`106`	`+ $this->db = Propel::getConnection($database->getParameter('name'));`
	`107`	`+ }`
	`108`	`+ elseif($databaseClass == 'sfDoctrineDatabase')`
`105`	`109`	`{`
`106`	`110`	`$this->db = $database->getConnection();`
`107`	`111`	`}`