diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php index ad39b2aae..4056c5191 100644 --- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php +++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php @@ -20,6 +20,9 @@ */ class sfDoctrineConnectionListener extends Doctrine_EventListener { + public $encoding; + public $connection; + public function __construct($connection, $encoding) { $this->connection = $connection; @@ -31,4 +34,4 @@ public function postConnect(Doctrine_Event $event) $this->connection->setCharset($this->encoding); $this->connection->setDateFormat(); } -} \ No newline at end of file +} diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php index fd2ac0319..84c48ae71 100644 --- a/lib/routing/sfRoute.class.php +++ b/lib/routing/sfRoute.class.php @@ -37,7 +37,9 @@ class sfRoute implements Serializable $defaults = array(), $requirements = array(), $tokens = array(), - $customToken = false; + $customToken = false, + $firstOptional = 0, + $segments = array(); /** * Constructor.